- also log script's name (if given)

[projects/pld-ftp-admin.git] / modules / cmds.py

diff --git a/modules/cmds.py b/modules/cmds.py
index 9f3f8506e2ffbbb6d2e1444511364688b48441b8..46bb55b286bcadc746246305615841229700164e 100644 (file)
--- a/modules/cmds.py
+++ b/modules/cmds.py
@@ -31,21 +31,26 @@ def lock(con, arg, hard):
         con.sock.send("SOFT") # Soft lock - try in a second or two
         
     
-def unlock(con, arg):
+def cmd_unlock(con, arg):
     if arg in locks:
         del locks[arg]
 
-def lock_soft(con, arg):
+def cmd_lock_soft(con, arg):
     lock(con, arg, False)
 
-def lock_hard(con, arg):
+def cmd_lock_hard(con, arg):
     lock(con, arg, True)
 
 logfile=open(os.environ['HOME']+'/pld-ftp-admin/var/log', 'a')
 
-def log(con, msg):
-    logfile.write('%s -- %s\n' % (time.strftime('%Y-%m-%d %H:%M:%S'), msg))
+def cmd_log(con, msg):
+    logfile.write('%s [%s] -- %s\n' % (time.strftime('%Y-%m-%d %H:%M:%S'), 
+                                       con.name, msg))
     logfile.flush()
 
-cmdlist={'lcks':lock_soft, 'lckh':lock_hard, 'ulck':unlock, 'log1':log}
+def cmd_name(con, name):
+    con.name=name
+
+cmdlist={'lcks':cmd_lock_soft, 'lckh':cmd_lock_hard, 'ulck':cmd_unlock,
+         'log1':cmd_log, 'name':cmd_name}