From unknown Mon Aug 11 19:04:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#58840: 29.0.50; Make scheduled reconnects friendlier in ERC Resent-From: "J.P." Original-Sender: "Debbugs-submit" Resent-CC: emacs-erc@gnu.org, bug-gnu-emacs@gnu.org Resent-Date: Fri, 28 Oct 2022 13:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 58840 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 58840@debbugs.gnu.org Cc: emacs-erc@gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org X-Debbugs-Original-Xcc: emacs-erc@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166696372128778 (code B ref -1); Fri, 28 Oct 2022 13:29:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Oct 2022 13:28:41 +0000 Received: from localhost ([127.0.0.1]:60680 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ooPPb-0007U4-NH for submit@debbugs.gnu.org; Fri, 28 Oct 2022 09:28:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:60260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ooPPW-0007Tt-Vn for submit@debbugs.gnu.org; Fri, 28 Oct 2022 09:28:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ooPPJ-0003KW-G0 for bug-gnu-emacs@gnu.org; Fri, 28 Oct 2022 09:28:31 -0400 Received: from mail-108-mta4.mxroute.com ([136.175.108.4]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ooPPC-00060G-UZ for bug-gnu-emacs@gnu.org; Fri, 28 Oct 2022 09:28:21 -0400 Received: from mail-111-mta2.mxroute.com ([136.175.111.2] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta4.mxroute.com (ZoneMTA) with ESMTPSA id 1841ec749230006e99.001 for (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256); Fri, 28 Oct 2022 13:28:07 +0000 X-Zone-Loop: bf0613d82135f26badcd48643474e0290aab0f7f5e52 X-Originating-IP: [136.175.111.2] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=neverwas.me ; s=x; h=Content-Type:MIME-Version:Message-ID:Date:Subject:To:From:Sender: Reply-To:Cc:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=7AjPgK495WQB8zivbtphOpxfYaOsK7oHR7zHijQuGw0=; b=f+0AlfkOTXS9NzDAJjvtC5iUWM EwkrPpVV3DA5KbYVrJVtLdazsocMVOsaM7B48uTxfprgM7SlMw4kqJNcJuOPQR691LY8HSYsa/1rx Nke8HSD5R6NTYDG4a6XJcdOIGNRk1ATuxm8fpINKhYBWeGAUDRyBuI3dSGqIvrZBTLpk9bz4XlQxn L12O+taLfTu8V5qg4OfdZxqq6X84FmJuo0B+ud2uSlJ8wACFnEdu6KcT5Qk/q2qGfu8X0d9g8fgOE ermzetQIFvrD10LUZla21aHb3xMiYf6LLXz+TMT/O2AxNIfX2VpIheJ8JZVpC4qbdFoS4gJihKlFl Ilj+msrQ==; From: "J.P." Date: Fri, 28 Oct 2022 06:27:56 -0700 Message-ID: <87lep0nkmb.fsf@neverwas.me> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Authenticated-Id: masked@neverwas.me Received-SPF: pass client-ip=136.175.108.4; envelope-from=jp@neverwas.me; helo=mail-108-mta4.mxroute.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain Tags: patch Hi people, IRC connections die for a good many reasons. But ERC currently lacks a decent means of staying abreast of scheduled reconnection attempts (which has reportedly confused and frustrated newer users). And trying to cancel an attempt (possibly to clear the way for reconnecting manually) is likewise inconvenient. The patch below tries to improve the situation somewhat. For starters, it borrows a "slash" command, /rmreconns, from Irssi and also introduces a slight variant, /rmreconn (without the "s"). These simply cancel one or all pending reconnect attempts. Suggestions for alternate names and/or aliases welcome. Also included is a tweak to /reconnect to ensure it always cancels an active timer before connecting. This should allow the lazy/impatient among us to expedite proceedings in a single command. Also added is a new "reconnecting in s" mode-line indicator as well as a printed reminder in the server buffer of the configured wait time when a timer is first set. Note that the mode line doesn't update automatically (there's no periodic countdown, IOW), but it *does* update on user input, e.g., when you move point around. (Hopefully that's sufficient.) Please offer feedback if you care about this feature. It's not a priority for me, so if anyone wants this in ERC 5.5 and Emacs 29, please make that known. Thanks, J.P. P.S. This patch assumes bug#56340's changes have been applied; expect some benign complaints from the compiler if they haven't. In GNU Emacs 29.0.50 (build 1, x86_64-pc-linux-gnu, GTK+ Version 3.24.34, cairo version 1.17.6) of 2022-10-26 built on localhost Repository revision: db2ed9f333879e5ac283fb48c8b06ed4022f0af9 Repository branch: master Windowing system distributor 'The X.Org Foundation', version 11.0.12014000 System Description: Fedora Linux 36 (Workstation Edition) Configured using: 'configure --enable-check-lisp-object-type --enable-checking=yes,glyphs 'CFLAGS=-O0 -g3' PKG_CONFIG_PATH=:/usr/lib64/pkgconfig:/usr/share/pkgconfig' Configured features: ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GPM GSETTINGS HARFBUZZ JPEG JSON LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 M17N_FLT MODULES NOTIFY INOTIFY PDUMPER PNG RSVG SECCOMP SOUND SQLITE3 THREADS TIFF TOOLKIT_SCROLL_BARS WEBP X11 XDBE XIM XINPUT2 XPM GTK3 ZLIB Important settings: value of $LANG: en_US.UTF-8 value of $XMODIFIERS: @im=ibus locale-coding-system: utf-8-unix Major mode: Lisp Interaction Minor modes in effect: tooltip-mode: t global-eldoc-mode: t eldoc-mode: t show-paren-mode: t electric-indent-mode: t mouse-wheel-mode: t tool-bar-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t line-number-mode: t indent-tabs-mode: t transient-mark-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t Load-path shadows: None found. Features: (shadow sort mail-extr emacsbug message mailcap yank-media puny dired dired-loaddefs rfc822 mml mml-sec password-cache epa derived epg rfc6068 epg-config gnus-util text-property-search time-date subr-x mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader cl-loaddefs cl-lib sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils rmc iso-transl tooltip cconv eldoc paren electric uniquify ediff-hook vc-hooks lisp-float-type elisp-mode mwheel term/x-win x-win term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list replace newcomment text-mode lisp-mode prog-mode register page tab-bar menu-bar rfn-eshadow isearch easymenu timer select scroll-bar mouse jit-lock font-lock syntax font-core term/tty-colors frame minibuffer nadvice seq simple cl-generic indonesian philippine cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese composite emoji-zwj charscript charprop case-table epa-hook jka-cmpr-hook help abbrev obarray oclosure cl-preloaded button loaddefs theme-loaddefs faces cus-face macroexp files window text-properties overlay sha1 md5 base64 format env code-pages mule custom widget keymap hashtable-print-readable backquote threads dbusbind inotify lcms2 dynamic-setting system-font-setting font-render-setting cairo move-toolbar gtk x-toolkit xinput2 x multi-tty make-network-process emacs) Memory information: ((conses 16 36089 6500) (symbols 48 5118 0) (strings 32 13124 1756) (string-bytes 1 372990) (vectors 16 9304) (vector-slots 8 147959 9387) (floats 8 21 29) (intervals 56 220 0) (buffers 1000 10)) --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Improve-auto-reconnect-visibility-in-ERC.patch >From 04fbbf93b1d97d3f486c7ec639c87f13fc6f4cce Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Thu, 27 Oct 2022 00:21:10 -0700 Subject: [PATCH] Improve auto-reconnect visibility in ERC * lisp/erc/erc-backend.el (erc--server-reconnect-timer): New variable. (erc-process-sentinel-2): Display time remaining until next reconnection attempt. Also slightly refactor and remove condition case. More importantly, no longer set `erc--server-reconnecting here'). (erc-server-connect): Initialize `erc--server-reconnect-timer' to nil. (erc-server-reconnect): Set `erc-server--reconnecting' here. (erc--mode-line-process-reconnecting): New constant to store value for "reconnect" state of `mode-line-process'. (erc--cancel-auto-reconnect-timer): New function to cancel auto-reconnect timer and print message. * lisp/erc/erc.el (erc-open): Only update mode line for target buffers. For server buffers, let `erc-login' and/or process sentinels take care of it. (erc-cmd-RECONNECT): Cancel existing auto-reconnect timer, if any, before proceeding. Defer to `erc-server-reconnect' to set `erc--server-reconnecting'. Fix `with-suppressed-warnings' form. (erc-cmd-RMRECONNS, erc-cmd-RMRECONN): Add new slash commands based on Irssi namesake. (erc-update-mode-line-buffer): Show "reconnecting in Ns" for `mode-line-process' when awaiting an automatic reconnect attempt. (erc-message-english-reconnecting, erc-message-english-reconnect-canceled): Add new message functions to English catalog. * lisp/erc/erc-scenarios-base-reconnect (erc-scenarios-base-cancel-reconnect): Add new test case for canceling reconnect timers. --- lisp/erc/erc-backend.el | 61 +++++++++++++------ lisp/erc/erc.el | 42 ++++++++----- test/lisp/erc/erc-scenarios-base-reconnect.el | 46 ++++++++++++++ 3 files changed, 115 insertions(+), 34 deletions(-) diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index df9efe4b0c..b5ba54efb5 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -206,6 +206,9 @@ erc-server-reconnect-count (defvar-local erc--server-last-reconnect-count 0 "Snapshot of reconnect count when the connection was established.") +(defvar-local erc--server-reconnect-timer nil + "Auto-reconnect timer for a network context.") + (defvar-local erc-server-quitting nil "Non-nil if the user requests a quit.") @@ -552,7 +555,8 @@ erc-server-connect (setq erc-server-process process) (setq erc-server-quitting nil) (setq erc-server-reconnecting nil - erc--server-reconnecting nil) + erc--server-reconnecting nil + erc--server-reconnect-timer nil) (setq erc-server-timed-out nil) (setq erc-server-banned nil) (setq erc-server-error-occurred nil) @@ -593,6 +597,7 @@ erc-server-reconnect (with-current-buffer buffer (erc-update-mode-line) (erc-set-active-buffer (current-buffer)) + (setq erc--server-reconnecting t) (setq erc-server-last-sent-time 0) (setq erc-server-lines-sent 0) (let ((erc-server-connect-function (or erc-session-connector @@ -665,37 +670,53 @@ erc-server-reconnect-p erc-server-reconnecting) (erc--server-reconnect-p event))) +(defconst erc--mode-line-process-reconnecting + '(:eval (erc-with-server-buffer + (and erc--server-reconnect-timer + (format ": reconnecting in %.1fs" + (- (timer-until erc--server-reconnect-timer + (current-time))))))) + "Mode-line construct showing seconds until next reconnect attempt. +Move point around to refresh.") + +(defun erc--cancel-auto-reconnect-timer () + (when erc--server-reconnect-timer + (cancel-timer erc--server-reconnect-timer) + (erc-display-message nil 'notice nil 'reconnect-canceled + ?u (buffer-name) + ?c (- (timer-until erc--server-reconnect-timer + (current-time)))) + (setq erc--server-reconnect-timer nil) + (erc-update-mode-line))) + (defun erc-process-sentinel-2 (event buffer) "Called when `erc-process-sentinel-1' has detected an unexpected disconnect." - (if (not (buffer-live-p buffer)) - (erc-update-mode-line) + (when (buffer-live-p buffer) (with-current-buffer buffer - (let ((reconnect-p (erc--server-reconnect-p event)) message delay) + (let ((reconnect-p (erc--server-reconnect-p event)) message) (setq message (if reconnect-p 'disconnected 'disconnected-noreconnect)) (erc-display-message nil 'error (current-buffer) message) (if (not reconnect-p) ;; terminate, do not reconnect (progn - (setq erc--server-reconnecting nil) + (setq erc--server-reconnecting nil + erc--server-reconnect-timer nil) (erc-display-message nil 'error (current-buffer) 'terminated ?e event) - ;; Update mode line indicators - (erc-update-mode-line) (set-buffer-modified-p nil)) ;; reconnect - (condition-case nil - (progn - (setq erc-server-reconnecting nil - erc--server-reconnecting t - erc-server-reconnect-count (1+ erc-server-reconnect-count)) - (setq delay erc-server-reconnect-timeout) - (run-at-time delay nil - #'erc-server-delayed-reconnect buffer)) - (error (unless (integerp erc-server-reconnect-attempts) - (message "%s ... %s" - "Reconnecting until we succeed" - "kill the ERC server buffer to stop")) - (erc-server-delayed-reconnect buffer)))))))) + (let ((count (and (integerp erc-server-reconnect-attempts) + (- erc-server-reconnect-attempts + (cl-incf erc-server-reconnect-count))))) + (erc-display-message nil 'error (current-buffer) 'reconnecting + ?m erc-server-reconnect-timeout + ?n (or count "unlimited") + ?s (if (eql 1 count) "" "s")) + (setq erc-server-reconnecting nil + erc--server-reconnect-timer + (run-at-time erc-server-reconnect-timeout nil + #'erc-server-delayed-reconnect buffer)))))) + (erc-update-mode-line))) (defun erc-process-sentinel-1 (event buffer) "Called when `erc-process-sentinel' has decided that we're disconnecting. diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index db39e341b2..c43f822b8b 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -2282,12 +2282,12 @@ erc-open ;; Saving log file on exit (run-hook-with-args 'erc-connect-pre-hook buffer) - (when connect - (erc-server-connect erc-session-server - erc-session-port - buffer - erc-session-client-certificate)) - (erc-update-mode-line) + (if connect + (erc-server-connect erc-session-server + erc-session-port + buffer + erc-session-client-certificate) + (erc-update-mode-line)) ;; Now display the buffer in a window as per user wishes. (unless (eq buffer old-buffer) @@ -4061,17 +4061,18 @@ erc-cmd-RECONNECT (unless (buffer-live-p buffer) (setq buffer (current-buffer))) (with-current-buffer buffer + (when erc--server-reconnect-timer + (erc--cancel-auto-reconnect-timer)) (setq erc-server-quitting nil) (with-suppressed-warnings ((obsolete erc-server-reconnecting)) (setq erc-server-reconnecting t)) - (setq erc--server-reconnecting t) (setq erc-server-reconnect-count 0) (setq process (get-buffer-process (erc-server-buffer))) (when process (delete-process process)) (erc-server-reconnect) (with-suppressed-warnings ((obsolete erc-server-reconnecting) - ((obsolete erc-reuse-buffers))) + (obsolete erc-reuse-buffers)) (if erc-reuse-buffers (progn (cl-assert (not erc--server-reconnecting)) (cl-assert (not erc-server-reconnecting))) @@ -4080,6 +4081,16 @@ erc-cmd-RECONNECT t) (put 'erc-cmd-RECONNECT 'process-not-needed t) +(defun erc-cmd-RMRECONNS () + "Cancel all auto-reconnect timers." + (erc-buffer-filter #'erc--cancel-auto-reconnect-timer) + t) + +(defun erc-cmd-RMRECONN () + "Cancel auto-reconnect timer for current connection." + (erc-with-server-buffer (erc--cancel-auto-reconnect-timer)) + t) + (defun erc-cmd-SERVER (server) "Connect to SERVER, leaving existing connection intact." (erc-log (format "cmd: SERVER: %s" server)) @@ -6976,11 +6987,12 @@ erc-update-mode-line-buffer (?s . ,(erc-format-target-and/or-server)) (?S . ,(erc-format-target-and/or-network)) (?t . ,(erc-format-target)))) - (process-status (cond ((and (erc-server-process-alive) - (not erc-server-connected)) - ":connecting") - ((erc-server-process-alive) - "") + (process-status (cond ((erc-server-process-alive buffer) + (unless erc-server-connected + ": connecting")) + ((erc-with-server-buffer + erc--server-reconnect-timer) + erc--mode-line-process-reconnecting) (t ": CLOSED"))) (face (cond ((eq erc-header-line-face-method nil) @@ -6991,7 +7003,7 @@ erc-update-mode-line-buffer 'erc-header-line)))) (setq mode-line-buffer-identification (list (format-spec erc-mode-line-format spec))) - (setq mode-line-process (list process-status)) + (setq mode-line-process process-status) (let ((header (if erc-header-line-format (format-spec erc-header-line-format spec) nil))) @@ -7176,6 +7188,8 @@ erc-define-catalog (disconnected . "\n\nConnection failed! Re-establishing connection...\n") (disconnected-noreconnect . "\n\nConnection failed! Not re-establishing connection.\n") + (reconnecting . "Reconnecting in %ms: %n attempt%s remaining...") + (reconnect-canceled . "Canceled %u reconnect timer with %cs to go...") (finished . "\n\n*** ERC finished ***\n") (terminated . "\n\n*** ERC terminated: %e\n") (login . "Logging in as `%n'...") diff --git a/test/lisp/erc/erc-scenarios-base-reconnect.el b/test/lisp/erc/erc-scenarios-base-reconnect.el index 49298dc594..466b087676 100644 --- a/test/lisp/erc/erc-scenarios-base-reconnect.el +++ b/test/lisp/erc/erc-scenarios-base-reconnect.el @@ -224,4 +224,50 @@ erc-scenarios-base-association-reconnect-playback (with-current-buffer "#chan" (funcall expect 10 "here comes the lady"))))) + +(ert-deftest erc-scenarios-base-cancel-reconnect () + :tags '(:expensive-test) + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "base/reconnect") + (dumb-server (erc-d-run "localhost" t 'timer 'timer 'timer-last)) + (port (process-contact dumb-server :service)) + (expect (erc-d-t-make-expecter)) + (erc-server-auto-reconnect t) + erc-autojoin-channels-alist + erc-server-buffer) + + (ert-info ("Connect to foonet") + (setq erc-server-buffer (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer + (should (string= (buffer-name) (format "127.0.0.1:%d" port))))) + + (ert-info ("Two connection attempts, all stymied") + (with-current-buffer erc-server-buffer + (ert-info ("First two attempts behave normally") + (dotimes (n 2) + (ert-info ((format "Initial attempt %d" (1+ n))) + (funcall expect 3 "Opening connection") + (funcall expect 2 "Password incorrect") + (funcall expect 2 "Connection failed!") + (funcall expect 2 "Re-establishing connection")))) + (ert-info ("/RECONNECT cancels timer but still attempts to connect") + (erc-cmd-RECONNECT) + (funcall expect 2 "Canceled") + (funcall expect 3 "Opening connection") + (funcall expect 2 "Password incorrect") + (funcall expect 2 "Connection failed!") + (funcall expect 2 "Re-establishing connection")) + (ert-info ("Explicit /RMRECONN simply cancels timer") + (erc-cmd-RMRECONN) + (funcall expect 2 "Canceled") + (erc-d-t-absent-for 1 "Opening connection" (point))))) + + (ert-info ("Server buffer is unique and temp name is absent") + (should (equal (list (get-buffer (format "127.0.0.1:%d" port))) + (erc-scenarios-common-buflist "127.0.0.1")))))) + ;;; erc-scenarios-base-reconnect.el ends here -- 2.37.3 --=-=-=-- From unknown Mon Aug 11 19:04:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#58840: 29.0.50; Make scheduled reconnects friendlier in ERC Resent-From: "J.P." Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 11 Nov 2022 14:08:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58840 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 58840@debbugs.gnu.org Cc: emacs-erc@gnu.org Received: via spool by 58840-submit@debbugs.gnu.org id=B58840.166817568131861 (code B ref 58840); Fri, 11 Nov 2022 14:08:03 +0000 Received: (at 58840) by debbugs.gnu.org; 11 Nov 2022 14:08:01 +0000 Received: from localhost ([127.0.0.1]:45445 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otUhM-0008Hp-2B for submit@debbugs.gnu.org; Fri, 11 Nov 2022 09:08:01 -0500 Received: from mail-108-mta186.mxroute.com ([136.175.108.186]:45849) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otUhJ-0008Ha-KW for 58840@debbugs.gnu.org; Fri, 11 Nov 2022 09:07:58 -0500 Received: from mail-111-mta2.mxroute.com ([136.175.111.2] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta186.mxroute.com (ZoneMTA) with ESMTPSA id 1846704ad520006e99.001 for <58840@debbugs.gnu.org> (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256); Fri, 11 Nov 2022 14:07:50 +0000 X-Zone-Loop: fe9e4a10ca12c2f4f1baca23d304f8740a2fc76255e9 X-Originating-IP: [136.175.111.2] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=neverwas.me ; s=x; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=iSLhGng1cLiqrhoLdtOYTFXarFZ37FsJmEgfJFBmGeo=; b=lqFqNWRuJN/KAA+ycPM+KApHG2 LOlS1ZxCvQw4b0hYs5o+5TC2h7QDBYzW3G7pbbSftvm0MPZfbuWehibO0xgsh+Da6lCBurpRmJUtX EXkYzsHZ+UJZ7Hti0DMqHLNJ4M7n6G//2i/9ZkPk2zTA606kGX8TDDrtKjzc1eew7hJo5Brh2L+Id +YScY3x3gyOh+fvlgU0yQfzVyApHGeHKGfrr0ic0tO5Ju8VtLYX0ZOkAfgR2CUz3torGiCbFflpSj xbFsB1XNh1lzVK3HOsY3Ih+MgS+FPQQNK4d1UwR0v34O9KdCysJkypz6ldk9OUvbuii+DLK2zIKEl WXGggkcA==; From: "J.P." In-Reply-To: <87lep0nkmb.fsf@neverwas.me> (J. P.'s message of "Fri, 28 Oct 2022 06:27:56 -0700") References: <87lep0nkmb.fsf@neverwas.me> Date: Fri, 11 Nov 2022 06:07:48 -0800 Message-ID: <87cz9t4ma3.fsf@neverwas.me> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Authenticated-Id: masked@neverwas.me X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain v2. Added user option to specify function run by reconnect timer. Factored out reconnect scheduling for use in user code. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0000-v1-v2.diff >From ce9519f9fa0ecae4dd538d83f12293c238b52c53 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Fri, 11 Nov 2022 00:05:00 -0800 Subject: [PATCH 0/1] *** NOT A PATCH *** *** BLURB HERE *** F. Jason Park (1): Improve auto-reconnect visibility in ERC lisp/erc/erc-backend.el | 77 ++++++++++++++----- lisp/erc/erc.el | 40 ++++++---- test/lisp/erc/erc-scenarios-base-reconnect.el | 46 +++++++++++ 3 files changed, 130 insertions(+), 33 deletions(-) Interdiff: diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index 5f592a2458..bcba2ed40b 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -404,6 +404,16 @@ erc-server-reconnect-timeout If a key is pressed while ERC is waiting, it will stop waiting." :type 'number) +(defcustom erc-server-reconnect-function 'erc-server-delayed-reconnect + "Function called by the reconnect timer to create a new connection. +Called with a server buffer as its only argument. Potential uses +include exponential backoff and checking for connectivity prior +to connecting. Use `erc-schedule-reconnect' to instead defer by +scheduling another round." + :package-version '(ERC . "5.4.1") ; FIXME on next release + :type '(choice (function-item erc-server-delayed-reconnect) + function)) + (defcustom erc-split-line-length 440 "The maximum length of a single message. If a message exceeds this size, it is broken into multiple ones. @@ -782,6 +792,22 @@ erc--cancel-auto-reconnect-timer (setq erc--server-reconnect-timer nil) (erc-update-mode-line))) +(defun erc-schedule-reconnect (buffer &optional incr) + "Create and return a reconnect timer for BUFFER. +When `erc-server-reconnect-attempts' is a number, increment +`erc-server-reconnect-count' by INCR unconditionally." + (let ((count (and (integerp erc-server-reconnect-attempts) + (- erc-server-reconnect-attempts + (cl-incf erc-server-reconnect-count (or incr 1)))))) + (erc-display-message nil 'error (current-buffer) 'reconnecting + ?m erc-server-reconnect-timeout + ?n (or count "unlimited") + ?s (if (eql 1 count) "" "s")) + (setq erc-server-reconnecting nil + erc--server-reconnect-timer + (run-at-time erc-server-reconnect-timeout nil + erc-server-reconnect-function buffer)))) + (defun erc-process-sentinel-2 (event buffer) "Called when `erc-process-sentinel-1' has detected an unexpected disconnect." (when (buffer-live-p buffer) @@ -798,17 +824,7 @@ erc-process-sentinel-2 'terminated ?e event) (set-buffer-modified-p nil)) ;; reconnect - (let ((count (and (integerp erc-server-reconnect-attempts) - (- erc-server-reconnect-attempts - (cl-incf erc-server-reconnect-count))))) - (erc-display-message nil 'error (current-buffer) 'reconnecting - ?m erc-server-reconnect-timeout - ?n (or count "unlimited") - ?s (if (eql 1 count) "" "s")) - (setq erc-server-reconnecting nil - erc--server-reconnect-timer - (run-at-time erc-server-reconnect-timeout nil - #'erc-server-delayed-reconnect buffer)))))) + (erc-schedule-reconnect buffer)))) (erc-update-mode-line))) (defun erc-process-sentinel-1 (event buffer) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 0ead2941a2..4c92e4ce0d 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -6923,7 +6923,7 @@ erc-define-catalog (disconnected . "\n\nConnection failed! Re-establishing connection...\n") (disconnected-noreconnect . "\n\nConnection failed! Not re-establishing connection.\n") - (reconnecting . "Reconnecting in %ms: %n attempt%s remaining...") + (reconnecting . "Reconnecting in %ms: %n additional attempt%s remaining...") (reconnect-canceled . "Canceled %u reconnect timer with %cs to go...") (finished . "\n\n*** ERC finished ***\n") (terminated . "\n\n*** ERC terminated: %e\n") -- 2.38.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Improve-auto-reconnect-visibility-in-ERC.patch >From ce9519f9fa0ecae4dd538d83f12293c238b52c53 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Thu, 27 Oct 2022 00:21:10 -0700 Subject: [PATCH 1/1] Improve auto-reconnect visibility in ERC * lisp/erc/erc-backend.el (erc--server-reconnect-timer): New variable. (erc-server-reconnect-function): New user option. (erc-process-sentinel-2): Display time remaining until next reconnection attempt. Also remove condition case and move bulk of else condition logic to `erc-schedule-reconnect'. More importantly, no longer set `erc--server-reconnecting here'). (erc-server-connect): Initialize `erc--server-reconnect-timer' to nil. (erc-server-reconnect): Set `erc-server--reconnecting' here. (erc--mode-line-process-reconnecting): New constant to store value for "reconnect" state of `mode-line-process'. (erc--cancel-auto-reconnect-timer): New function to cancel auto-reconnect timer and print message. (erc-schedule-reconnect): New function for scheduling another reconnect attempt. * lisp/erc/erc.el (erc-open): Only update mode line for target buffers. For server buffers, let `erc-login' and/or process sentinels take care of it. (erc-cmd-RECONNECT): Cancel existing auto-reconnect timer, if any, before proceeding. Defer to `erc-server-reconnect' to set `erc--server-reconnecting'. Fix `with-suppressed-warnings' form. (erc-cmd-RMRECONNS, erc-cmd-RMRECONN): Add new slash commands based on Irssi namesake. (erc-update-mode-line-buffer): Show "reconnecting in Ns" for `mode-line-process' when awaiting an automatic reconnect attempt. (erc-message-english-reconnecting, erc-message-english-reconnect-canceled): Add new message functions to English catalog. * lisp/erc/erc-scenarios-base-reconnect (erc-scenarios-base-cancel-reconnect): Add new test case for canceling reconnect timers. --- lisp/erc/erc-backend.el | 77 ++++++++++++++----- lisp/erc/erc.el | 40 ++++++---- test/lisp/erc/erc-scenarios-base-reconnect.el | 46 +++++++++++ 3 files changed, 130 insertions(+), 33 deletions(-) diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index 026b34849a..bcba2ed40b 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -299,6 +299,9 @@ erc-server-reconnect-count (defvar-local erc--server-last-reconnect-count 0 "Snapshot of reconnect count when the connection was established.") +(defvar-local erc--server-reconnect-timer nil + "Auto-reconnect timer for a network context.") + (defvar-local erc-server-quitting nil "Non-nil if the user requests a quit.") @@ -401,6 +404,16 @@ erc-server-reconnect-timeout If a key is pressed while ERC is waiting, it will stop waiting." :type 'number) +(defcustom erc-server-reconnect-function 'erc-server-delayed-reconnect + "Function called by the reconnect timer to create a new connection. +Called with a server buffer as its only argument. Potential uses +include exponential backoff and checking for connectivity prior +to connecting. Use `erc-schedule-reconnect' to instead defer by +scheduling another round." + :package-version '(ERC . "5.4.1") ; FIXME on next release + :type '(choice (function-item erc-server-delayed-reconnect) + function)) + (defcustom erc-split-line-length 440 "The maximum length of a single message. If a message exceeds this size, it is broken into multiple ones. @@ -645,7 +658,8 @@ erc-server-connect (setq erc-server-process process) (setq erc-server-quitting nil) (setq erc-server-reconnecting nil - erc--server-reconnecting nil) + erc--server-reconnecting nil + erc--server-reconnect-timer nil) (setq erc-server-timed-out nil) (setq erc-server-banned nil) (setq erc-server-error-occurred nil) @@ -686,6 +700,7 @@ erc-server-reconnect (with-current-buffer buffer (erc-update-mode-line) (erc-set-active-buffer (current-buffer)) + (setq erc--server-reconnecting t) (setq erc-server-last-sent-time 0) (setq erc-server-lines-sent 0) (let ((erc-server-connect-function (or erc-session-connector @@ -758,37 +773,59 @@ erc-server-reconnect-p erc-server-reconnecting) (erc--server-reconnect-p event))) +(defconst erc--mode-line-process-reconnecting + '(:eval (erc-with-server-buffer + (and erc--server-reconnect-timer + (format ": reconnecting in %.1fs" + (- (timer-until erc--server-reconnect-timer + (current-time))))))) + "Mode-line construct showing seconds until next reconnect attempt. +Move point around to refresh.") + +(defun erc--cancel-auto-reconnect-timer () + (when erc--server-reconnect-timer + (cancel-timer erc--server-reconnect-timer) + (erc-display-message nil 'notice nil 'reconnect-canceled + ?u (buffer-name) + ?c (- (timer-until erc--server-reconnect-timer + (current-time)))) + (setq erc--server-reconnect-timer nil) + (erc-update-mode-line))) + +(defun erc-schedule-reconnect (buffer &optional incr) + "Create and return a reconnect timer for BUFFER. +When `erc-server-reconnect-attempts' is a number, increment +`erc-server-reconnect-count' by INCR unconditionally." + (let ((count (and (integerp erc-server-reconnect-attempts) + (- erc-server-reconnect-attempts + (cl-incf erc-server-reconnect-count (or incr 1)))))) + (erc-display-message nil 'error (current-buffer) 'reconnecting + ?m erc-server-reconnect-timeout + ?n (or count "unlimited") + ?s (if (eql 1 count) "" "s")) + (setq erc-server-reconnecting nil + erc--server-reconnect-timer + (run-at-time erc-server-reconnect-timeout nil + erc-server-reconnect-function buffer)))) + (defun erc-process-sentinel-2 (event buffer) "Called when `erc-process-sentinel-1' has detected an unexpected disconnect." - (if (not (buffer-live-p buffer)) - (erc-update-mode-line) + (when (buffer-live-p buffer) (with-current-buffer buffer - (let ((reconnect-p (erc--server-reconnect-p event)) message delay) + (let ((reconnect-p (erc--server-reconnect-p event)) message) (setq message (if reconnect-p 'disconnected 'disconnected-noreconnect)) (erc-display-message nil 'error (current-buffer) message) (if (not reconnect-p) ;; terminate, do not reconnect (progn - (setq erc--server-reconnecting nil) + (setq erc--server-reconnecting nil + erc--server-reconnect-timer nil) (erc-display-message nil 'error (current-buffer) 'terminated ?e event) - ;; Update mode line indicators - (erc-update-mode-line) (set-buffer-modified-p nil)) ;; reconnect - (condition-case nil - (progn - (setq erc-server-reconnecting nil - erc--server-reconnecting t - erc-server-reconnect-count (1+ erc-server-reconnect-count)) - (setq delay erc-server-reconnect-timeout) - (run-at-time delay nil - #'erc-server-delayed-reconnect buffer)) - (error (unless (integerp erc-server-reconnect-attempts) - (message "%s ... %s" - "Reconnecting until we succeed" - "kill the ERC server buffer to stop")) - (erc-server-delayed-reconnect buffer)))))))) + (erc-schedule-reconnect buffer)))) + (erc-update-mode-line))) (defun erc-process-sentinel-1 (event buffer) "Called when `erc-process-sentinel' has decided that we're disconnecting. diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 6b14cf87e2..4c92e4ce0d 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -2032,12 +2032,12 @@ erc-open ;; Saving log file on exit (run-hook-with-args 'erc-connect-pre-hook buffer) - (when connect - (erc-server-connect erc-session-server - erc-session-port - buffer - erc-session-client-certificate)) - (erc-update-mode-line) + (if connect + (erc-server-connect erc-session-server + erc-session-port + buffer + erc-session-client-certificate) + (erc-update-mode-line)) ;; Now display the buffer in a window as per user wishes. (unless (eq buffer old-buffer) @@ -3809,10 +3809,11 @@ erc-cmd-RECONNECT (unless (buffer-live-p buffer) (setq buffer (current-buffer))) (with-current-buffer buffer + (when erc--server-reconnect-timer + (erc--cancel-auto-reconnect-timer)) (setq erc-server-quitting nil) (with-suppressed-warnings ((obsolete erc-server-reconnecting)) (setq erc-server-reconnecting t)) - (setq erc--server-reconnecting t) (setq erc-server-reconnect-count 0) (setq process (get-buffer-process (erc-server-buffer))) (when process @@ -3828,6 +3829,16 @@ erc-cmd-RECONNECT t) (put 'erc-cmd-RECONNECT 'process-not-needed t) +(defun erc-cmd-RMRECONNS () + "Cancel all auto-reconnect timers." + (erc-buffer-filter #'erc--cancel-auto-reconnect-timer) + t) + +(defun erc-cmd-RMRECONN () + "Cancel auto-reconnect timer for current connection." + (erc-with-server-buffer (erc--cancel-auto-reconnect-timer)) + t) + (defun erc-cmd-SERVER (server) "Connect to SERVER, leaving existing connection intact." (erc-log (format "cmd: SERVER: %s" server)) @@ -6711,11 +6722,12 @@ erc-update-mode-line-buffer (?s . ,(erc-format-target-and/or-server)) (?S . ,(erc-format-target-and/or-network)) (?t . ,(erc-format-target)))) - (process-status (cond ((and (erc-server-process-alive) - (not erc-server-connected)) - ":connecting") - ((erc-server-process-alive) - "") + (process-status (cond ((erc-server-process-alive buffer) + (unless erc-server-connected + ": connecting")) + ((erc-with-server-buffer + erc--server-reconnect-timer) + erc--mode-line-process-reconnecting) (t ": CLOSED"))) (face (cond ((eq erc-header-line-face-method nil) @@ -6726,7 +6738,7 @@ erc-update-mode-line-buffer 'erc-header-line)))) (setq mode-line-buffer-identification (list (format-spec erc-mode-line-format spec))) - (setq mode-line-process (list process-status)) + (setq mode-line-process process-status) (let ((header (if erc-header-line-format (format-spec erc-header-line-format spec) nil))) @@ -6911,6 +6923,8 @@ erc-define-catalog (disconnected . "\n\nConnection failed! Re-establishing connection...\n") (disconnected-noreconnect . "\n\nConnection failed! Not re-establishing connection.\n") + (reconnecting . "Reconnecting in %ms: %n additional attempt%s remaining...") + (reconnect-canceled . "Canceled %u reconnect timer with %cs to go...") (finished . "\n\n*** ERC finished ***\n") (terminated . "\n\n*** ERC terminated: %e\n") (login . "Logging in as `%n'...") diff --git a/test/lisp/erc/erc-scenarios-base-reconnect.el b/test/lisp/erc/erc-scenarios-base-reconnect.el index 49298dc594..466b087676 100644 --- a/test/lisp/erc/erc-scenarios-base-reconnect.el +++ b/test/lisp/erc/erc-scenarios-base-reconnect.el @@ -224,4 +224,50 @@ erc-scenarios-base-association-reconnect-playback (with-current-buffer "#chan" (funcall expect 10 "here comes the lady"))))) + +(ert-deftest erc-scenarios-base-cancel-reconnect () + :tags '(:expensive-test) + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "base/reconnect") + (dumb-server (erc-d-run "localhost" t 'timer 'timer 'timer-last)) + (port (process-contact dumb-server :service)) + (expect (erc-d-t-make-expecter)) + (erc-server-auto-reconnect t) + erc-autojoin-channels-alist + erc-server-buffer) + + (ert-info ("Connect to foonet") + (setq erc-server-buffer (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer + (should (string= (buffer-name) (format "127.0.0.1:%d" port))))) + + (ert-info ("Two connection attempts, all stymied") + (with-current-buffer erc-server-buffer + (ert-info ("First two attempts behave normally") + (dotimes (n 2) + (ert-info ((format "Initial attempt %d" (1+ n))) + (funcall expect 3 "Opening connection") + (funcall expect 2 "Password incorrect") + (funcall expect 2 "Connection failed!") + (funcall expect 2 "Re-establishing connection")))) + (ert-info ("/RECONNECT cancels timer but still attempts to connect") + (erc-cmd-RECONNECT) + (funcall expect 2 "Canceled") + (funcall expect 3 "Opening connection") + (funcall expect 2 "Password incorrect") + (funcall expect 2 "Connection failed!") + (funcall expect 2 "Re-establishing connection")) + (ert-info ("Explicit /RMRECONN simply cancels timer") + (erc-cmd-RMRECONN) + (funcall expect 2 "Canceled") + (erc-d-t-absent-for 1 "Opening connection" (point))))) + + (ert-info ("Server buffer is unique and temp name is absent") + (should (equal (list (get-buffer (format "127.0.0.1:%d" port))) + (erc-scenarios-common-buflist "127.0.0.1")))))) + ;;; erc-scenarios-base-reconnect.el ends here -- 2.38.1 --=-=-=-- From unknown Mon Aug 11 19:04:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#58840: 29.0.50; Make scheduled reconnects friendlier in ERC Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 13 Nov 2022 04:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58840 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: "J.P." Cc: emacs-erc@gnu.org, 58840@debbugs.gnu.org Received: via spool by 58840-submit@debbugs.gnu.org id=B58840.166831270331668 (code B ref 58840); Sun, 13 Nov 2022 04:12:01 +0000 Received: (at 58840) by debbugs.gnu.org; 13 Nov 2022 04:11:43 +0000 Received: from localhost ([127.0.0.1]:49756 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ou4LP-0008Eh-3c for submit@debbugs.gnu.org; Sat, 12 Nov 2022 23:11:43 -0500 Received: from mail-oa1-f53.google.com ([209.85.160.53]:37516) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ou4LM-0008ER-E7 for 58840@debbugs.gnu.org; Sat, 12 Nov 2022 23:11:40 -0500 Received: by mail-oa1-f53.google.com with SMTP id 586e51a60fabf-12c8312131fso9383917fac.4 for <58840@debbugs.gnu.org>; Sat, 12 Nov 2022 20:11:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date:message-id:reply-to; bh=I4kM3WdRSMD3/CPPHpg+MC3peAuHuVYFQLdR+Go/weA=; b=UwINSSMPlDI8hWkdPfMnV0IYpmgVXjwpLJUk1J2nNFT4x2Avz4+idcW/Eu3JZbwIVm a3ZSI3+xWJhkBibcFHHjBvL1V2bzDPFzSbgTSZ6VwrTJW/h1amILCGQ3TsHUTT6hJJyT Oa3Te3iLXL6zvYkaJv4vB+y5agZul+qFfffy9TG4giXq/iU+4Njn9BgLz+IqpRD56qZe bHYtGRaLPWdK5Kmnr1RRWyyc9vE70Vpl54T+p6ZTRbnURPpfZTVTDGI08iQLOjgpBurU G1HQQAbdfXtn3LRf2yjGxA8OBy7qyA0djjWvYmQar3yG1zPEGKNnn4+6ossbgIK0FEBA 3RyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=I4kM3WdRSMD3/CPPHpg+MC3peAuHuVYFQLdR+Go/weA=; b=YgPlbhdbhWfXzFFFBQfmIqGFMq83iRE9Q/Arq/iU71HmbScB6oZBor4Fs+X7ft32N/ OcR811gzrGaogzQlbA5ZrWpcOLbhKGZCI9k8MZdpXCOjm7V4uAVScXN1DFRVnWTEkdmN HI49TEDKQuCWYlsyFVeKSiprksvShcLfl2/BIgdDJ1P6G5OUnGFTGzCTd+fUHZuHz2us f8gQzpkjfpVZSdAWRfdjJ37W16gqGCMOxFRYDuJCDXJ8TXBsqaNcjQEOBHulv/k795yK V5i2b6J0sY3IMHIkjQaPIZehueqjhjWKYKLYnTcqiHwu3qoO/SXXIf8w2wof2FlWfJjU WsDQ== X-Gm-Message-State: ANoB5plqwjZiN4iDjhoyuO9kY1gFcA5viwvK6sa7pWqz2hcio86QSlHY 9HncRjQBvlyZr6a2eE1CPBfvnNy4LYjG91B4Wa31TP6SDkI= X-Google-Smtp-Source: AA0mqf7hok5lp4uK7toJ4kwteeYn0B+jQAPD9t2WYPt4jdV3bukCJdJmY9+5xjbwE2xQc2nyUx3+sE8JAq1vXk2M2GA= X-Received: by 2002:a05:6870:6c15:b0:13b:8a07:2a1f with SMTP id na21-20020a0568706c1500b0013b8a072a1fmr4414428oab.199.1668312694994; Sat, 12 Nov 2022 20:11:34 -0800 (PST) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Sat, 12 Nov 2022 20:11:34 -0800 From: Stefan Kangas In-Reply-To: <87cz9t4ma3.fsf@neverwas.me> (J. P.'s message of "Fri, 11 Nov 2022 06:07:48 -0800") References: <87lep0nkmb.fsf@neverwas.me> <87cz9t4ma3.fsf@neverwas.me> X-Hashcash: 1:20:221113:jp@neverwas.me::P5QFO2PQvSqeWS8W:1O7v MIME-Version: 1.0 Date: Sat, 12 Nov 2022 20:11:34 -0800 Message-ID: Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) "J.P." writes: > v2. Added user option to specify function run by reconnect timer. > Factored out reconnect scheduling for use in user code. Looks good to me after a cursory read. I didn't test it, but if you feel confident about it, I think it should go in. Bonus points for the regression tests, as always. Don't forget to add the bug number to the commit message. From unknown Mon Aug 11 19:04:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#58840: 29.0.50; Make scheduled reconnects friendlier in ERC Resent-From: "J.P." Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 13 Nov 2022 15:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58840 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Stefan Kangas Cc: emacs-erc@gnu.org, 58840@debbugs.gnu.org Received: via spool by 58840-submit@debbugs.gnu.org id=B58840.16683534794758 (code B ref 58840); Sun, 13 Nov 2022 15:32:01 +0000 Received: (at 58840) by debbugs.gnu.org; 13 Nov 2022 15:31:19 +0000 Received: from localhost ([127.0.0.1]:52356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ouEx4-0001Ef-W2 for submit@debbugs.gnu.org; Sun, 13 Nov 2022 10:31:19 -0500 Received: from mail-108-mta69.mxroute.com ([136.175.108.69]:45615) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ouEx2-0001ER-4i for 58840@debbugs.gnu.org; Sun, 13 Nov 2022 10:31:17 -0500 Received: from mail-111-mta2.mxroute.com ([136.175.111.2] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta69.mxroute.com (ZoneMTA) with ESMTPSA id 184719d9fa50006e99.001 for <58840@debbugs.gnu.org> (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256); Sun, 13 Nov 2022 15:31:06 +0000 X-Zone-Loop: d5791af86eb3839c9c9031cc30d742d1324be75d8ebe X-Originating-IP: [136.175.111.2] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=neverwas.me ; s=x; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=j92mIm5923tAl8bSxAcBrirwIUNnAgI1KYmbOWaJPtg=; b=T25xbGwyvUvuvmMe37c/ws7jJi 1stDIIGZd3Anoegm3DUhI/fCaNGAMEtcfWraBdIdPpa/O+Dtl7Obm1dlbtl8Q6YcliQUapaFrWMXv 9p/3zI2tt9oa8nTGuzaoAb0bqWDqI8b812rr/fQ+dpjgWXqV5pSRAq/kMWXISgusvNuBU+sq/AY2J vxHilO5WxWYbmdKhnlXnfyIItFMLMuieJdvrxDZWOGhFw0sOYr5hvI5EEZ21av30M2S2nfj0zD/Lx TXJ74nHgZ/0prSGWa2ULVXyB4gyukVTKXfv39Mi4oGmKUsrUNR7znDVMzQksDWxTzNrAax7d+Ur9t nmOYXd0w==; From: "J.P." In-Reply-To: (Stefan Kangas's message of "Sat, 12 Nov 2022 20:11:34 -0800") References: <87lep0nkmb.fsf@neverwas.me> <87cz9t4ma3.fsf@neverwas.me> Date: Sun, 13 Nov 2022 07:31:03 -0800 Message-ID: <8735amq3bc.fsf@neverwas.me> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Authenticated-Id: masked@neverwas.me X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Stefan Kangas writes: > "J.P." writes: > >> v2. Added user option to specify function run by reconnect timer. >> Factored out reconnect scheduling for use in user code. > > Looks good to me after a cursory read. Wow, thanks a lot for taking a look! > I didn't test it, but if you feel confident about it, I think it > should go in. I'd really like it to, but lot's of stuff's in play right now, so it's hard to say for sure. > Don't forget to add the bug number to the commit message. Ooh, right. Thanks. (I've been living dangerously so far, barely catching them at the last second, but my luck's probably running out.) From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 17 01:10:38 2022 Received: (at control) by debbugs.gnu.org; 17 Nov 2022 06:10:38 +0000 Received: from localhost ([127.0.0.1]:58851 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovY6g-0003G4-FA for submit@debbugs.gnu.org; Thu, 17 Nov 2022 01:10:38 -0500 Received: from mail-108-mta136.mxroute.com ([136.175.108.136]:32955) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovY6e-0003Fr-Ki for control@debbugs.gnu.org; Thu, 17 Nov 2022 01:10:37 -0500 Received: from mail-111-mta2.mxroute.com ([136.175.111.2] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta136.mxroute.com (ZoneMTA) with ESMTPSA id 1848435d2780006e99.001 for (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256); Thu, 17 Nov 2022 06:10:30 +0000 X-Zone-Loop: 359e430eb0a87e458cd280ad3c407143dc12cedf8b61 X-Originating-IP: [136.175.111.2] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=neverwas.me ; s=x; h=Content-Type:MIME-Version:Message-ID:Date:Subject:To:From:Sender: Reply-To:Cc:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=L6Gw5sXrbz3m/0TtkUdO/NgsRNBjON6ehRD0CATSpl8=; b=TlK6x+axoqso4Ey7Wg/cm+Tenb xxjAY7GAbXBfePUypDvMpaRd5Axck/jGVbNk+kfyqDCkIl4CzDVis87dw6yNDYf21Mfnvglx3SzOD UWMJ3a5laAygieqR9b1RMTo06LK5kgQ44w8kAqAMMnZdLPDXN5r3l+iOpvHgdHqX75obJw2e0h83S QPtsNd1/4b+mKj30GpYXM/k6C0GhVJQryi1B1tios6Y5FtHScZx/SEy8XNKoW3EjYEmk8j/zjjQZx Tkg2z0KqN67QP77A3xGiqf5QS4baf13TKqJn1O862S0h2h4Bi91VzUqNb3kHSe5gc6IILHd/NWIYq +917v4ug==; From: "J.P." To: control@debbugs.gnu.org Subject: control message for bug #58840 Date: Wed, 16 Nov 2022 22:10:28 -0800 Message-ID: <87zgcqkt63.fsf@neverwas.me> MIME-Version: 1.0 Content-Type: text/plain X-Authenticated-Id: masked@neverwas.me X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) close 58840 29.1 quit Thanks.