From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Thomas Riccardi Newsgroups: gmane.emacs.bugs Subject: bug#5650: Issue with the patch Date: Sun, 25 Apr 2010 22:39:14 +0200 Message-ID: <1272227954.9935.39.camel@kiwi-pc2> References: <87wry1x9k2.wl%richard.lewis@gold.ac.uk> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-dGgCPGJ9922TSmN2GYqZ" X-Trace: dough.gmane.org 1272262671 24882 80.91.229.12 (26 Apr 2010 06:17:51 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 26 Apr 2010 06:17:51 +0000 (UTC) To: 5650@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Apr 26 08:17:50 2010 connect(): No such file or directory Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1O6Hdb-0000XJ-U8 for geb-bug-gnu-emacs@m.gmane.org; Mon, 26 Apr 2010 08:17:48 +0200 Original-Received: from localhost ([127.0.0.1]:37416 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O6HVx-0001Ho-Pg for geb-bug-gnu-emacs@m.gmane.org; Mon, 26 Apr 2010 02:09:53 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O68ra-0007Lm-C8 for bug-gnu-emacs@gnu.org; Sun, 25 Apr 2010 16:55:38 -0400 Original-Received: from [140.186.70.92] (port=40749 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O68rX-0007Kd-5v for bug-gnu-emacs@gnu.org; Sun, 25 Apr 2010 16:55:37 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O68rT-000166-M3 for bug-gnu-emacs@gnu.org; Sun, 25 Apr 2010 16:55:34 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:55165) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O68rT-00015q-Jd for bug-gnu-emacs@gnu.org; Sun, 25 Apr 2010 16:55:31 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1O68fO-0008Ii-19; Sun, 25 Apr 2010 16:43:02 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <87wry1x9k2.wl%richard.lewis@gold.ac.uk> Resent-From: Thomas Riccardi Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 25 Apr 2010 20:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 5650 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 5650-submit@debbugs.gnu.org id=B5650.127222816031901 (code B ref 5650); Sun, 25 Apr 2010 20:43:01 +0000 Original-Received: (at 5650) by debbugs.gnu.org; 25 Apr 2010 20:42:40 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O68f1-0008IU-2n for submit@debbugs.gnu.org; Sun, 25 Apr 2010 16:42:39 -0400 Original-Received: from mail-ww0-f44.google.com ([74.125.82.44]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O68bp-0008GO-6t for 5650@debbugs.gnu.org; Sun, 25 Apr 2010 16:39:21 -0400 Original-Received: by wwb24 with SMTP id 24so3058756wwb.3 for <5650@debbugs.gnu.org>; Sun, 25 Apr 2010 13:39:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:content-type :date:message-id:mime-version:x-mailer; bh=mHzyhJU0zCv872TDEx6F9Eq/yRbSJwNhlIUza6C4I3k=; b=tjwF8nRJxLA8mfeEsr3K4IDO0DTbDjFcT96FmVcbWmMu2J/YL5XYt1/VhSSTEJzh1u wWF8bcey61XvKw54h7+87llQtMfMOnc+FduHYThLML091efycDdZZGVkH5CMYiB9yGpN muzCDQ/D+0qahnAbLZLI4NKs6mdb7wTxGKoGk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:content-type:date:message-id:mime-version:x-mailer; b=R17Z1tjyJo6cxQ539OFuiepztUJwxP/5c6XMxC0X9Y8yR0x980OHMD5iwH7P6MO3ll OfhXceYH1fXedHTcHgsCktJq+9nrC9gykUB04U6cDK7NZFxUYn6WmY508TCdeiVavP0O xb6nxhdhsHIdlq+5PEb95qY20YM7i3BiQjkTc= Original-Received: by 10.216.87.80 with SMTP id x58mr4092846wee.96.1272227956572; Sun, 25 Apr 2010 13:39:16 -0700 (PDT) Original-Received: from [192.168.0.1] (cvl92-2-82-228-145-47.fbx.proxad.net [82.228.145.47]) by mx.google.com with ESMTPS id t27sm15899681wbc.23.2010.04.25.13.39.14 (version=SSLv3 cipher=RC4-MD5); Sun, 25 Apr 2010 13:39:15 -0700 (PDT) X-Mailer: Evolution 2.28.3 X-Mailman-Approved-At: Sun, 25 Apr 2010 16:42:38 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Sun, 25 Apr 2010 16:43:02 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Mailman-Approved-At: Mon, 26 Apr 2010 01:56:50 -0400 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:36508 Archived-At: --=-dGgCPGJ9922TSmN2GYqZ Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit The patch works for me (even if there is still a small freeze during about 1 second at the connection if the server doesn't answer), but creates an issue with the auto reconnect feature. It happens when the server doesn't answer the connection request (tested with a DROP on packets coming from it with iptables). The patch makes the function erc-server-connect to return even if the connection is not ready. Then erc-open and erc-server-reconnect do the same. Finally, in erc-process-sentinel-2, there is no error executing erc-server-reconnect, thus erc-server-reconnect-count is never incremented and is even reset. I made a patch that increments erc-server-reconnect-count before calling erc-server-reconnect instead, and resets it only when the connection is really ready, that is, in erc-connection-established. --=-dGgCPGJ9922TSmN2GYqZ Content-Disposition: attachment; filename="Fix-reconnect-attempts-count.patch" Content-Type: text/x-patch; name="Fix-reconnect-attempts-count.patch"; charset="UTF-8" Content-Transfer-Encoding: 7bit diff --git a/.emacs.d/erc-5.3/erc-backend.el b/.emacs.d/erc-5.3/erc-backend.el index 70ce789..928770e 100644 --- a/.emacs.d/erc-5.3/erc-backend.el +++ b/.emacs.d/erc-5.3/erc-backend.el @@ -618,13 +618,11 @@ EVENT is the message received from the closed connection process." (condition-case err (progn (setq erc-server-reconnecting nil) - (erc-server-reconnect) - (setq erc-server-reconnect-count 0)) + (setq erc-server-reconnect-count (1+ erc-server-reconnect-count)) + (erc-server-reconnect)) (error (when (buffer-live-p buffer) (set-buffer buffer) - (if (integerp erc-server-reconnect-attempts) - (setq erc-server-reconnect-count - (1+ erc-server-reconnect-count)) + (unless (integerp erc-server-reconnect-attempts) (message "%s ... %s" "Reconnecting until we succeed" "kill the ERC server buffer to stop")) diff --git a/.emacs.d/erc-5.3/erc.el b/.emacs.d/erc-5.3/erc.el index 9aa5e8b..802ae66 100644 --- a/.emacs.d/erc-5.3/erc.el +++ b/.emacs.d/erc-5.3/erc.el @@ -4267,6 +4267,7 @@ Set user modes and run `erc-after-connect' hook." (nick (car (erc-response.command-args parsed))) (buffer (process-buffer proc))) (setq erc-server-connected t) + (setq erc-server-reconnect-count 0) (erc-update-mode-line) (erc-set-initial-user-mode nick buffer) (erc-server-setup-periodical-ping buffer) --=-dGgCPGJ9922TSmN2GYqZ--