X-Git-Url: http://gitweb.pimeys.fr/?a=blobdiff_plain;f=salesman.py;h=bd425f24e4bf8739517f8051617d67e388700a0d;hb=104ba9507f2c963fba9ab656524c4740f8cf8d14;hp=e5523c2a969dc78434150de68a540b2085ef6c4d;hpb=929ca4863d6da06c8f2ac6028b96552bb3ba2032;p=bots%2Fsalesman.git

diff --git a/salesman.py b/salesman.py
index e5523c2..bd425f2 100755
--- a/salesman.py
+++ b/salesman.py
@@ -5,15 +5,20 @@
 
 # Un bot IRC qui sort des déconnaissances
 
-import irclib
-import ircbot
 import threading
 import random
 import time
 import pickle
 import re
+import signal
+import sys
 from remplace_accents import remplace_accents
 
+# Oui, j'ai recodé ma version d'irclib pour pouvoir rattrapper les SIGHUP
+sys.path.insert(0, "/home/vincent/scripts/python-myirclib")
+import irclib
+import ircbot
+
 config_password="Yamoussoukro"
 config_pseudo="salesman"
 config_chanlist=["#bot","#flood"]
@@ -59,7 +64,7 @@ config_leave_messages=[u"On continuera à jouer plus tard ;)"]
 # temps au bout duquel, si personne n'a parlé, on se tait
 config_idle_time=20*60
 # liste des bots, qui ne sont pas considérés comme de l'activité
-config_idle_bots=["deconnaisseur","Basile","historien","hung","salesman","Shadobot","Wen","___"]
+config_idle_bots=["deconnaisseur","Basile","historien","hung","salesman","Shadobot","Wen","___","Sanctuary","Saturnin"]
 
 class UnicodeBotError(Exception):
     pass
@@ -557,7 +562,7 @@ class Salesman(ircbot.SingleServerIRCBot):
             log(self.serveur,"%s kické de %s par %s (raison : %s)" %(victime,channel,auteur,raison))
             time.sleep(5)
             serv.join(channel)
-            self.update_activity(message[1],"")
+            self.update_activity(channel,"")
             # on ne dit rien au rejoin
             #l1,l2=config_kick_answers,config_kick_actions
             #n1,n2=len(l1),len(l2)
@@ -604,17 +609,42 @@ class Salesman(ircbot.SingleServerIRCBot):
             self.last_activity[canal]=time.time()
     def is_active(self,canal):
         return time.time()-self.last_activity[canal]<config_idle_time
+    
+    def start_as_daemon(self, outfile):
+        sys.stderr = Logger(outfile)
+        self.start()
+
+
+class Logger(object):
+    """Pour écrire ailleurs que sur stdout"""
+    def __init__(self, filename="salesman.full.log"):
+        self.filename = filename
+
+    def write(self, message):
+        f = open(self.filename, "a")
+        f.write(message)
+        f.close()
+
 
 if __name__=="__main__":
     import sys
     if len(sys.argv)==1:
-        print "Usage : Salesman.py <serveur> [--debug]"
+        print "Usage : salesman.py <serveur> [--debug] [--no-output] [--daemon [--pidfile]] [--outfile]"
+        print "        --outfile sans --no-output ni --daemon n'a aucun effet"
         exit(1)
     serveur=sys.argv[1]
+
     if "debug" in sys.argv or "--debug" in sys.argv:
         debug=True
     else:
         debug=False
+    if "--no-output" in sys.argv or "--daemon" in sys.argv:
+        outfile = "/var/log/bots/salesman.full.log"
+        for arg in sys.argv:
+            arg = arg.split("=")
+            if arg[0].strip('-') in ["out", "outfile", "logfile"]:
+                outfile = arg[1]
+        sys.stdout = Logger(outfile)
     serveurs={"a♡":"acoeur.crans.org","acoeur":"acoeur.crans.org","acoeur.crans.org":"acoeur.crans.org",
               "irc":"irc.crans.org","crans":"irc.crans.org","irc.crans.org":"irc.crans.org"}
     try:
@@ -623,4 +653,21 @@ if __name__=="__main__":
         print "Server Unknown : %s"%(serveur)
         exit(404)
     salesman=Salesman(serveur,debug)
-    salesman.start()
+    if daemon:
+        child_pid = os.fork()
+        if child_pid == 0:
+            os.setsid()
+            salesman.start_as_daemon(outfile)
+        else:
+            # on enregistre le pid de salesman
+            pidfile = "/var/run/bots/salesman.pid"
+            for arg in sys.argv:
+                arg = arg.split("=")
+                if arg[0].strip('-') in ["pidfile"]:
+                    pidfile = arg[1]
+            f = open(pidfile, "w")
+            f.write("%s\n" % child_pid)
+            f.close()
+    else:
+        salesman.start()
+