projects
/
irc-logger.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
460aef9
)
r8780: changes for new cl-irc package
author
Kevin M. Rosenberg
<kevin@rosenberg.net>
Mon, 29 Mar 2004 19:06:09 +0000
(19:06 +0000)
committer
Kevin M. Rosenberg
<kevin@rosenberg.net>
Mon, 29 Mar 2004 19:06:09 +0000
(19:06 +0000)
logger.lisp
patch
|
blob
|
history
diff --git
a/logger.lisp
b/logger.lisp
index f186916eef3175e2472aebf091072bd21a807011..c686d4197aac13213bc99af7b8c16b6a3c463615 100644
(file)
--- a/
logger.lisp
+++ b/
logger.lisp
@@
-9,7
+9,7
@@
(defvar *daemon-monitor-process* nil "Process of background monitor.")
(defclass channel ()
(defvar *daemon-monitor-process* nil "Process of background monitor.")
(defclass channel ()
- ((name :initarg :name :reader name
+ ((name :initarg :name :reader
c-
name
:documentation "Name of channel.")
(streams :initarg :streams :reader streams
:documentation "List of output streams.")
:documentation "Name of channel.")
(streams :initarg :streams :reader streams
:documentation "List of output streams.")
@@
-22,7
+22,7
@@
:documentation "IRC connection object.")
(handler :initform nil :accessor handler
:documentation "Background handler process.")
: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.")
:documentation "Nickname of the bot.")
(password :initarg :password :reader password
:documentation "Nickname's nickserver password.")
@@
-30,9
+30,9
@@
:documentation "Connected IRC server.")
(channel-names :initarg :channel-names :accessor channel-names
:documentation "List of channel names.")
: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")
: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.")
:documentation "Username for cl-irc")
(logging-stream :initarg :logging-stream :reader logging-stream
:documentation "logging-stream for cl-irc.")
@@
-76,7
+76,7
@@
:case-insensitive-mode t))
(defun find-logger-with-nick (nick)
: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))
(defun find-logger-with-connection (conn)
(find conn (the list *loggers*) :test #'eq :key #'connection))
@@
-168,15
+168,15
@@
(setf (elt (current-output-names channel) istream) value))
(defun ensure-output-stream-for-unichannel (utime logger channel istream)
(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)
(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)
(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)
(get-format logger istream) utime)))
(unless (probe-file path)
(ensure-directories-exist path)
@@
-184,7
+184,7
@@
(open path :direction :output :if-exists :error
:if-does-not-exist :create))
(write-file-header (get-format logger istream)
(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)
(get-stream channel istream))
(close (get-stream channel istream)))
(setf (get-stream channel istream)
@@
-304,7
+304,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)
(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)))
(unichannel logger))
(force-output (get-stream channel istream)))
@@
-378,7
+378,7
@@
(let ((logger (find-logger-with-connection (connection msg)))
(channel (first (arguments msg))))
(cond
(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))))))
(add-private-log-entry logger "~A" (raw-message-string msg)))
(t
(output-event msg :privmsg channel (trailing-argument msg))))))
@@
-405,11
+405,11
@@
(channel (first (arguments msg)))
(who-kicked (second (arguments msg))))
(output-event msg :kick channel who-kicked)
(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)"
(add-private-log-entry
logger
"Logging daemon ~A has been kicked from ~A (~A)"
- (nickname logger) channel (trailing-argument msg))
+ (
l-
nickname logger) channel (trailing-argument msg))
(daemon-sleep 1)
(remove-channel-logger logger channel)
(daemon-sleep 1)
(daemon-sleep 1)
(remove-channel-logger logger channel)
(daemon-sleep 1)
@@
-421,12
+421,12
@@
(channel (first (arguments msg))))
(cond
((and (string-equal (source msg) "NickServ")
(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.")))
(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))))))
(add-private-log-entry logger "~A" (raw-message-string msg)))
(t
(output-event msg :notice channel (trailing-argument msg))))))
@@
-604,7
+604,7
@@
(sleep 1)
(ignore-errors
(let* ((c (connection logger))
(sleep 1)
(ignore-errors
(let* ((c (connection logger))
- (user (find-user c (nickname logger))))
+ (user (find-user c (
l-
nickname logger))))
(when (and c user)
(dolist (channel (channels logger))
(remove-channel user channel)))))
(when (and c user)
(dolist (channel (channels logger))
(remove-channel user channel)))))
@@
-615,7
+615,7
@@
(close (unknown-log-stream logger)))
(setq *loggers*
(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 "")
t))))
(defun add-logger (nick server &key channels output (password "")
@@
-680,7
+680,7
@@
(let ((target (second (arguments msg)))
(logger (find-logger-with-connection (connection msg))))
(when (and (stringp target)
(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))))
(setf (warning-message-utime logger) (received-time msg)))
(add-private-log-entry logger "Killed by ~A" (source msg))))
@@
-688,7
+688,7
@@
(let ((text (trailing-argument msg))
(logger (find-logger-with-connection (connection msg))))
(when (and (stringp text)
(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)))
+ (zerop (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))))
(setf (warning-message-utime logger) (received-time msg)))
(output-event msg :error nil (trailing-argument msg))))
@@
-754,10
+754,10
@@
(log-disconnection logger)
(when (connection logger)
(ignore-errors (quit-with-timeout (connection logger) "Client terminated by server"))
(log-disconnection logger)
(when (connection logger)
(ignore-errors (quit-with-timeout (connection logger) "Client terminated by server"))
- (setf *recon-nick* (nickname logger)
+ (setf *recon-nick* (
l-
nickname logger)
*recon-server* (server 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)
*recon-password* (password logger)
*recon-async* (async logger)
*recon-user-output* (user-output logger)