X-Git-Url: https://plomlompom.com/repos/?p=plomlombot-irc.git;a=blobdiff_plain;f=plomlombot.py;h=b7829d2b9992ec230d5602772b1959641a52d0fd;hp=f81c05ed31aa5f2e94db66d5d6589a6c3d3707b9;hb=65f8d561ee89665bd62c134cdbd1cd978edcecdf;hpb=cab26fc280cebb5c648fe09a6d2f2f3796ea3a81

diff --git a/plomlombot.py b/plomlombot.py
index f81c05e..b7829d2 100755
--- a/plomlombot.py
+++ b/plomlombot.py
@@ -53,7 +53,10 @@ class IO:
     def __init__(self, server, port, timeout):
         self.timeout = timeout
         self.socket = socket.socket()
-        self.socket.connect((server, port))
+        try:
+            self.socket.connect((server, port))
+        except TimeoutError:
+            raise ExceptionForRestart
         self.socket.setblocking(0)
         self.line_buffer = []
         self.rune_buffer = ""
@@ -353,7 +356,7 @@ def handle_url(url, notice, show_url=False):
 
 class Session:
 
-    def __init__(self, io, username, nickname, channel, twtfile, dbdir):
+    def __init__(self, io, username, nickname, channel, twtfile, dbdir, rmlogs):
         self.io = io
         self.nickname = nickname
         self.username = username
@@ -361,14 +364,18 @@ class Session:
         self.users_in_chan = []
         self.twtfile = twtfile
         self.dbdir = dbdir
+        self.rmlogs = rmlogs
         self.io.send_line("NICK " + self.nickname)
         self.io.send_line("USER " + self.username + " 0 * : ")
         self.io.send_line("JOIN " + self.channel)
         hash_channel = hashlib.md5(self.channel.encode("utf-8")).hexdigest()
         self.chandir = self.dbdir + "/" + hash_channel + "/"
+        self.rawlogdir = self.chandir + "raw_logs/"
         self.logdir = self.chandir + "logs/"
         if not os.path.exists(self.logdir):
             os.makedirs(self.logdir)
+        if not os.path.exists(self.rawlogdir):
+            os.makedirs(self.rawlogdir)
         self.markovfile = self.chandir + "markovfeed"
         self.quotesfile = self.chandir + "quotes"
 
@@ -379,7 +386,7 @@ class Session:
                 line = Line(":" + self.nickname + "!~" + self.username +
                             "@localhost" + " " + line)
             now = datetime.datetime.utcnow()
-            logfile = open(self.logdir + now.strftime("%Y-%m-%d") + ".raw_log", "a")
+            logfile = open(self.rawlogdir + now.strftime("%Y-%m-%d") + ".txt", "a")
             form = "%Y-%m-%d %H:%M:%S UTC\t"
             logfile.write(now.strftime(form) + " " + line.line + "\n")
             logfile.close()
@@ -413,6 +420,12 @@ class Session:
             file.close()
 
         while True:
+            if self.rmlogs > 0:
+                for f in os.listdir(self.logdir):
+                    f = os.path.join(self.logdir, f)
+                    if os.path.isfile(f) and \
+                            os.stat(f).st_mtime < time.time() - self.rmlogs:
+                        os.remove(f)
             line = self.io.recv_line()
             if not line:
                 continue
@@ -449,7 +462,7 @@ def parse_command_line_arguments():
                         + str(PORT) + ")")
     parser.add_argument("-w, --wait", action="store", dest="timeout",
                         type=int, default=TIMEOUT,
-                        help="timeout in seconds after which to attempt " +
+                        help="timeout in seconds after which to attempt "
                         "reconnect (default: " + str(TIMEOUT) + ")")
     parser.add_argument("-u, --username", action="store", dest="username",
                         default=USERNAME, help="username to use (default: "
@@ -462,6 +475,10 @@ def parse_command_line_arguments():
                         + TWTFILE + ")")
     parser.add_argument("-d, --dbdir", action="store", dest="dbdir",
                         default=DBDIR, help="directory to store DB files in")
+    parser.add_argument("-r, --rmlogs", action="store", dest="rmlogs",
+                        type=int, default=0,
+                        help="maximum age in seconds for logfiles in logs/ "
+                        "(0 means: never delete, and is default)")
     parser.add_argument("CHANNEL", action="store", help="channel to join")
     opts, unknown = parser.parse_known_args()
     return opts
@@ -474,7 +491,7 @@ while True:
         hash_server = hashlib.md5(opts.server.encode("utf-8")).hexdigest()
         dbdir = opts.dbdir + "/" + hash_server 
         session = Session(io, opts.username, opts.nickname, opts.CHANNEL,
-            opts.twtfile, dbdir)
+            opts.twtfile, dbdir, opts.rmlogs)
         session.loop()
     except ExceptionForRestart:
         io.socket.close()