Changeset 712

Timestamp:

11/04/07 19:45:16 (14 months ago)

Author:

michiel

Message:

move stuff to a configfile

Location:

tools/nsa

Files:

• nsa.ini.template (added)
• nsa.py (modified) (4 diffs)

tools/nsa/nsa.py

@@ -30 +30 @@
 import datetime
 import signal
+import ConfigParser
 
 sys.path.insert(0, 'lib')
@@ -201 +202 @@
 
 class NSABot(SingleServerIRCBot):
-        trac = tracinfo("/home/httpd/3dmembers/michiel/mvblog.org/dev")
-        #trac = tracinfo("/home/michiel/dev/personal/trac-env")
+        trac = tracinfo(tracenv)
 
         def __init__(self, channel, nickname, server, port=6667):
@@ -232 +232 @@
                         ticket = self.trac.do_ticket(params)
                         if ticket:
-                                output = "[%s %s: %s] #%s [%s] %s reported by %s http://dev.mvblog.org/trac/ticket/%s" % (ticket[0])
+                                output = "[%s %s: %s] #%s [%s] %s reported by %s %sticket/%s" % (ticket[0], tracurl)
                         else:
                                 output = "No such ticket"
@@ -280 +280 @@
 
 if __name__ == "__main__":
-        if len(sys.argv) != 4:
-                print "Usage: nsa <server[:port]> <channel> <nickname>"
-                sys.exit(1)
-
-        s = sys.argv[1].split(":", 1)
-        server = s[0]
-        if len(s) == 2:
-                try:
-                        port = int(s[1])
-                except ValueError:
-                        print "Error: Erroneous port."
-                        sys.exit(1)
-        else:
-                port = 6667
-        channel = sys.argv[2]
-        nickname = sys.argv[3]
+#       if len(sys.argv) != 4:
+#               print "Usage: nsa <server[:port]> <channel> <nickname>"
+#               sys.exit(1)
+
+#       s = sys.argv[1].split(":", 1)
+#       server = s[0]
+#       if len(s) == 2:
+#               try:
+#                       port = int(s[1])
+#               except ValueError:
+#                       print "Error: Erroneous port."
+#                       sys.exit(1)
+#       else:
+#               port = 6667
+#       channel = sys.argv[2]
+#       nickname = sys.argv[3]
+
+        # Read configfile
+        config = ConfigParser.ConfigParser()
+        config.read('nsa.ini')
+        server   = config.get('irc', 'server')
+        port     = config.getint('irc', 'port')
+        nickname = config.get('irc', 'nickname')
+        channel  = config.get('irc', 'channel')
+        tracenv  = config.get('trac' 'env')
+        tracurl  = config.get('trac', 'url')
+        pidfile  = config.get('global', 'pid')
 
         # daemonize
-        daemon = Daemon("/var/run/nsa.pid")
+        daemon = Daemon(pidfile)
 
         # Handle signals