Commit afa803d5 authored by Glenn Morris's avatar Glenn Morris
Browse files

(erc-server-send-ping): Move after definition of erc-server-send.

parent adf8caef
2007-12-01 Glenn Morris <rgm@gnu.org>
* erc-backend.el (erc-server-send-ping): Move after definition of
erc-server-send.
2007-11-30 Dan Nicolaescu <dann@ics.uci.edu>
* erc.el (open-ssl-stream, open-tls-stream, erc-network-name):
......
......@@ -461,27 +461,6 @@ Currently this is called by `erc-send-input'."
(upcase-word 1)
(buffer-string)))
(defun erc-server-send-ping (buf)
"Send a ping to the IRC server buffer in BUF.
Additionally, detect whether the IRC process has hung."
(if (buffer-live-p buf)
(with-current-buffer buf
(if (and erc-server-send-ping-timeout
(>
(erc-time-diff (erc-current-time)
erc-server-last-received-time)
erc-server-send-ping-timeout))
(progn
;; if the process is hung, kill it
(setq erc-server-timed-out t)
(delete-process erc-server-process))
(erc-server-send (format "PING %.0f" (erc-current-time)))))
;; remove timer if the server buffer has been killed
(let ((timer (assq buf erc-server-ping-timer-alist)))
(when timer
(erc-cancel-timer (cdr timer))
(setcdr timer nil)))))
(defun erc-server-setup-periodical-ping (buffer)
"Set up a timer to periodically ping the current server.
The current buffer is given by BUFFER."
......@@ -775,6 +754,27 @@ protection algorithm."
(message "ERC: No process running")
nil)))
(defun erc-server-send-ping (buf)
"Send a ping to the IRC server buffer in BUF.
Additionally, detect whether the IRC process has hung."
(if (buffer-live-p buf)
(with-current-buffer buf
(if (and erc-server-send-ping-timeout
(>
(erc-time-diff (erc-current-time)
erc-server-last-received-time)
erc-server-send-ping-timeout))
(progn
;; if the process is hung, kill it
(setq erc-server-timed-out t)
(delete-process erc-server-process))
(erc-server-send (format "PING %.0f" (erc-current-time)))))
;; remove timer if the server buffer has been killed
(let ((timer (assq buf erc-server-ping-timer-alist)))
(when timer
(erc-cancel-timer (cdr timer))
(setcdr timer nil)))))
;; From Circe
(defun erc-server-send-queue (buffer)
"Send messages in `erc-server-flood-queue'.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment