irkerd: Store less state in IRCServerConnection.connect()

[irker.git] / filter-test.py

diff --git a/filter-test.py b/filter-test.py
index ae91127cb920b64de19d2259780325f0c6c06072..030d3d4de6c5001c391ac56c150291786db197c2 100755 (executable)
--- a/filter-test.py
+++ b/filter-test.py
@@ -2,18 +2,17 @@
 #
 # Test hook to launch an irker instance (if it doesn't already exist)
 # just before shipping the notification. We start it in in another terminal
-# so you can watch the debug messages. Probably only of interest only to
+# so you can watch the debug messages. Intended to be used in the root
+# directory of the irker repo. Probably only of interest only to irker
 # developers
 #
-# To use it, set up irkerhook.py to file on each commit.
-# Then set the filtercmd variable in your repo config as follows:
+# To use this, set up irkerhook.py to fire on each commit.  Creating a
+# .git/hooks/post-commit file containing the line "irkerhook.py"; be
+# sure to make the opos-commit file executable.  Then set the
+# filtercmd variable in your repo config as follows:
 # 
 # [irker]
 #      filtercmd = filter-test.py
-#
-# This is rather antisocial - imagine thousands of irkerds holding open
-# connections to IRCDs.  It's better to go through an instance running
-# at your forge or set up for shared use by your intranet administrator.
 
 import os, sys, json, subprocess, time
 metadata = json.loads(sys.argv[1])
@@ -24,10 +23,13 @@ ps = subprocess.Popen("ps -U %s uh" % os.getenv("LOGNAME"),
 data = ps.stdout.read()
 irkerd_count = len([x for x in data.split("\n") if x.find("irkerd") != -1])
 
-if not irkerd_count:
+if irkerd_count:
+    sys.stderr.write("Using a running irker instance...\n")
+else:
+    sys.stderr.write("Launching a new irker instance...\n")
     os.system("gnome-terminal --title 'irkerd' -e 'irkerd -d 2' &")
 
-time.sleep(0.1)        # Avoid a race condition
+time.sleep(1.5)        # Avoid a race condition
 
 print json.dumps(metadata)
 # end