X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=logger.lisp;h=065effa485c76bd7be8931ae2f7fa2b2bb336d36;hb=097d28989cb7d3e3c824212e1ddeeb8d6a2a3f39;hp=14294517eca26b1827a6f374aad079c33c88d02d;hpb=0f9d06416786a978c616fbdfdfef871c29e310a6;p=irc-logger.git diff --git a/logger.lisp b/logger.lisp index 1429451..065effa 100644 --- a/logger.lisp +++ b/logger.lisp @@ -7,9 +7,10 @@ (in-package #:irc-logger) (defvar *daemon-monitor-process* nil "Process of background monitor.") +(defparameter *timeout* 60) -(defclass channel () - ((name :initarg :name :reader name +(defclass log-channel () + ((name :initarg :name :reader c-name :documentation "Name of channel.") (streams :initarg :streams :reader streams :documentation "List of output streams.") @@ -22,7 +23,7 @@ :documentation "IRC connection object.") (handler :initform nil :accessor handler :documentation "Background handler process.") - (nick :initarg :nick :reader nickname + (nick :initarg :nick :reader l-nickname :documentation "Nickname of the bot.") (password :initarg :password :reader password :documentation "Nickname's nickserver password.") @@ -30,9 +31,9 @@ :documentation "Connected IRC server.") (channel-names :initarg :channel-names :accessor channel-names :documentation "List of channel names.") - (realname :initarg :realname :reader realname + (realname :initarg :realname :reader l-realname :documentation "Realname for cl-irc") - (username :initarg :username :reader username + (username :initarg :username :reader l-username :documentation "Username for cl-irc") (logging-stream :initarg :logging-stream :reader logging-stream :documentation "logging-stream for cl-irc.") @@ -66,6 +67,10 @@ :documentation "Time of last, potentially active, warning message."))) +(defmethod print-object ((obj logger) stream) + (print-unreadable-object (obj stream :type t :identity t) + (format stream "~A" (l-nickname obj)))) + (defvar *loggers* nil "List of active loggers.") (defparameter *user-address-scanner* @@ -76,7 +81,7 @@ :case-insensitive-mode t)) (defun find-logger-with-nick (nick) - (find nick (the list *loggers*) :test #'string-equal :key #'nickname)) + (find nick (the list *loggers*) :test #'string-equal :key #'l-nickname)) (defun find-logger-with-connection (conn) (find conn (the list *loggers*) :test #'eq :key #'connection)) @@ -85,7 +90,7 @@ (string-left-trim '(#\#) name)) (defun find-channel-with-name (logger name) - (find name (the list (channels logger)) :test #'string-equal :key #'name)) + (find name (the list (channels logger)) :test #'string-equal :key #'c-name)) (defun make-output-name (name year month day) (format nil "~A-~4,'0D.~2,'0D.~2,'0D" (canonicalize-channel-name name) @@ -141,6 +146,9 @@ (defmethod log-file-path (output-root channel-name year month day (format (eql :sexp))) (%log-file-path output-root channel-name year month day "sexp")) +(defmethod log-file-path (output-root channel-name year month day (format (eql :binary))) + (%log-file-path output-root channel-name year month day "bin")) + (defmethod log-file-path (output-root channel-name year month day (format (eql :text))) (%log-file-path output-root channel-name year month day "txt")) @@ -168,15 +176,15 @@ (setf (elt (current-output-names channel) istream) value)) (defun ensure-output-stream-for-unichannel (utime logger channel istream) - (let ((name (make-output-name-utime (name channel) utime))) + (let ((name (make-output-name-utime (c-name channel) utime))) (unless (string= name (get-output-name channel istream)) (when (get-stream channel istream) (write-file-footer (get-format logger istream) - (name channel) + (c-name channel) (get-stream channel istream)) (close (get-stream channel istream))) (setf (get-output-name channel istream) name) - (let ((path (log-file-path-utime (output-root channel) (name channel) + (let ((path (log-file-path-utime (output-root channel) (c-name channel) (get-format logger istream) utime))) (unless (probe-file path) (ensure-directories-exist path) @@ -184,7 +192,7 @@ (open path :direction :output :if-exists :error :if-does-not-exist :create)) (write-file-header (get-format logger istream) - (name channel) + (c-name channel) (get-stream channel istream)) (close (get-stream channel istream))) (setf (get-stream channel istream) @@ -304,7 +312,7 @@ (defun output-event-for-a-stream (msg type channel text logger istream) (ensure-output-stream (received-time msg) logger channel istream) (%output-event (get-format logger istream) (get-stream channel istream) - (received-time msg) type (name channel) (source msg) text msg + (received-time msg) type (c-name channel) (source msg) text msg (unichannel logger)) (force-output (get-stream channel istream))) @@ -372,21 +380,29 @@ (apply #'format nil fmt args))))) (defun add-private-log-entry (logger fmt &rest args) - (apply #'add-log-entry (get-private-log-stream logger) fmt args)) + (apply #'add-log-entry + (if (get-private-log-stream logger) + (get-private-log-stream logger) + *standard-output*) + fmt args)) (defun privmsg-hook (msg) (let ((logger (find-logger-with-connection (connection msg))) (channel (first (arguments msg)))) (cond - ((equal channel (nickname logger)) + ((equal channel (l-nickname logger)) (add-private-log-entry logger "~A" (raw-message-string msg))) (t (output-event msg :privmsg channel (trailing-argument msg)))))) (defun action-hook (msg) - (output-event msg :action (first (arguments msg)) - (subseq (trailing-argument msg) 8 - (- (length (trailing-argument msg)) 1)))) + (let ((end (- (length (trailing-argument msg)) 1))) + ;; end has been as low as 7 + (when (< end 8) + (warn "End is less than 8: `$A'." msg)) + (output-event msg :action (first (arguments msg)) + (subseq (trailing-argument msg) (min 8 end) + (- (length (trailing-argument msg)) 1))))) (defun nick-hook (msg) (output-event msg :nick nil (trailing-argument msg))) @@ -405,14 +421,14 @@ (channel (first (arguments msg))) (who-kicked (second (arguments msg)))) (output-event msg :kick channel who-kicked) - (when (string-equal (nickname logger) who-kicked) + (when (string-equal (l-nickname logger) who-kicked) (add-private-log-entry logger "Logging daemon ~A has been kicked from ~A (~A)" - (nickname logger) channel (trailing-argument msg)) - (daemon-sleep 1) + (l-nickname logger) channel (trailing-argument msg)) + (daemon-sleep 5) (remove-channel-logger logger channel) - (daemon-sleep 1) + (daemon-sleep 10) (add-channel-logger logger channel) (add-private-log-entry logger "Rejoined ~A" channel)))) @@ -421,12 +437,12 @@ (channel (first (arguments msg)))) (cond ((and (string-equal (source msg) "NickServ") - (string-equal channel (nickname logger)) + (string-equal channel (l-nickname logger)) (string-equal "owned by someone else" (trailing-argument msg))) (if logger (privmsg (connection msg) (source msg) (format nil "IDENTIFY ~A" (password logger))) (add-private-log-entry logger "NickServ asks for identity with connection not found."))) - ((equal channel (nickname logger)) + ((equal channel (l-nickname logger)) (add-private-log-entry logger "~A" (raw-message-string msg))) (t (output-event msg :notice channel (trailing-argument msg)))))) @@ -472,7 +488,7 @@ (defun make-a-channel (name formats output) - (make-instance 'channel + (make-instance 'log-channel :name name :streams (make-array (length formats) :initial-element nil) :output-root (when (and (pathnamep output) @@ -599,20 +615,23 @@ nick) nil) (t - (ignore-errors (irc:quit (connection logger) "")) - (stop-background-message-handler (handler logger)) + (ignore-errors (quit-with-timeout (connection logger) "")) + (ignore-errors (stop-background-message-handler (handler logger))) (sleep 1) - (dolist (channel (channels logger)) - (let ((c (connection logger))) - (when c - (ignore-errors (remove-channel c (find-channel c (name channel))))))) + (ignore-errors + (let* ((c (connection logger)) + (user (find-user c (l-nickname logger)))) + (when (and c user) + (dolist (channel (channels logger)) + (remove-channel user channel))))) + (ignore-errors (add-private-log-entry logger "Deleting loggers with nick of '~A' [remove-logger]." nick)) (when (private-log-stream logger) (close (private-log-stream logger))) (when (unknown-log-stream logger) (close (unknown-log-stream logger))) (setq *loggers* - (delete nick *loggers* :test #'string-equal :key #'nickname)) + (delete nick *loggers* :test #'string-equal :key #'l-nickname)) t)))) (defun add-logger (nick server &key channels output (password "") @@ -623,13 +642,31 @@ (add-private-log-entry (find-logger-with-nick nick) "Closing previously active connection [add-logger].") (ignore-errors (remove-logger nick))) - (let ((logger (create-logger nick server :channels channels :output output - :logging-stream logging-stream :password password - :realname realname :username username - :private-log private-log - :unknown-log unknown-log - :formats formats - :async async))) + (add-private-log-entry nil "Calling create-logger [add-logger].~%") + (let ((logger + (do ((new-logger + (mp:with-timeout (*timeout* nil) + (create-logger nick server :channels channels :output output + :logging-stream logging-stream :password password + :realname realname :username username + :private-log private-log + :unknown-log unknown-log + :formats formats + :async async)) + (mp:with-timeout (*timeout* nil) + (create-logger nick server :channels channels :output output + :logging-stream logging-stream :password password + :realname realname :username username + :private-log private-log + :unknown-log unknown-log + :formats formats + :async async)))) + (new-logger + (progn + (add-private-log-entry nil "Acquired new logger ~A." new-logger) + new-logger)) + (add-private-log-entry nil "Timeout trying to create new logger [add-logger].")))) + (add-private-log-entry logger "Pushing newly created logger ~A [add-logger].~%" logger) (push logger *loggers*) (start-logger logger async) logger)) @@ -656,7 +693,7 @@ (setf (get-stream channel i) nil))) (setf (channels logger) (delete channel-name (channels logger) :test #'string-equal - :key #'name)) + :key #'c-name)) (setf (channel-names logger) (delete channel-name (channel-names logger) :test #'string-equal)) t) @@ -677,7 +714,7 @@ (let ((target (second (arguments msg))) (logger (find-logger-with-connection (connection msg)))) (when (and (stringp target) - (string-equal target (nickname logger))) + (string-equal target (l-nickname logger))) (setf (warning-message-utime logger) (received-time msg))) (add-private-log-entry logger "Killed by ~A" (source msg)))) @@ -685,7 +722,8 @@ (let ((text (trailing-argument msg)) (logger (find-logger-with-connection (connection msg)))) (when (and (stringp text) - (zerop (search (format nil "Closing Link: ~A" (nickname logger)) text))) + (eql 0 (search (format nil "Closing Link: ~A" + (l-nickname logger)) text))) (setf (warning-message-utime logger) (received-time msg))) (output-event msg :error nil (trailing-argument msg)))) @@ -715,14 +753,13 @@ (defun is-connected (logger) (%is-connected logger)) -(defparameter *timeout* 60) (defun is-connected (logger) #-allegro (%is-connected logger) #+allegro (mp:with-timeout (*timeout* nil) (%is-connected logger))) -(defun quit-maybe-timeout (connection msg) +(defun quit-with-timeout (connection msg) #-allegro (quit connection msg) #+allegro (mp:with-timeout (*timeout* nil) (quit connection msg))) @@ -750,11 +787,11 @@ (log-disconnection logger) (when (connection logger) - (ignore-errors (quit-maybe-timeout (connection logger) "Client terminated by server")) - (setf *recon-nick* (nickname logger) + (ignore-errors (quit-with-timeout (connection logger) "Client terminated by server")) + (setf *recon-nick* (l-nickname logger) *recon-server* (server logger) - *recon-username* (username logger) - *recon-realname* (realname logger) + *recon-username* (l-username logger) + *recon-realname* (l-realname logger) *recon-password* (password logger) *recon-async* (async logger) *recon-user-output* (user-output logger) @@ -782,34 +819,35 @@ (sleep 5) (when (is-connected new-logger) (log-reconnection new-logger))))) - - ) + ) ;; end closure (defun daemon-monitor () "This function runs in the background and monitors the connection of the logger." ;; run forever (loop do - (block main-loop - (dolist (logger *loggers*) - (do ((warning-time (warning-message-utime logger) (warning-message-utime logger))) - ((or (is-connected logger) (null warning-time))) - (cond - ((and warning-time (> (- (get-universal-time) warning-time) 180)) - ;;give up frequent checking because no disconnection despite waiting - (setf (warning-message-utime logger) nil)) - ((not (is-connected logger)) - (unless warning-time - (setf (warning-message-utime logger) (get-universal-time))) - (attempt-reconnection logger) - ;;after a succesful reconnection, the value of logger will be invalid - (sleep 30) - (return-from main-loop)) - (t - (daemon-sleep 30))))) - (do ((i 0 (1+ i))) - ((or (>= i 20) (some (lambda (logger) (warning-message-utime logger)) *loggers*))) - (daemon-sleep 15))))) - + (monitor-once))) + +(defun monitor-once () + (dolist (logger *loggers*) + (do ((warning-time (warning-message-utime logger) (warning-message-utime logger))) + ((and (is-connected logger) (null warning-time))) + (cond + ((and warning-time (> (- (get-universal-time) warning-time) 180)) + ;;give up frequent checking because no disconnection despite waiting + (setf (warning-message-utime logger) nil)) + ((not (is-connected logger)) + (unless warning-time + (setf (warning-message-utime logger) (get-universal-time))) + (attempt-reconnection logger) + ;;after a succesful reconnection, the value of logger will be invalid + (sleep 30) + (return-from monitor-once)) + (t + (daemon-sleep 30))))) + (do ((i 0 (1+ i))) + ((or (>= i 10) (some (lambda (logger) (warning-message-utime logger)) *loggers*))) + (daemon-sleep 15))) +