- also log script's name (if given)

Changed files:
    modules/cmds.py -> 1.3
    modules/cons.py -> 1.2
    modules/ftpio.py -> 1.3

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}
 

diff --git a/modules/cons.py b/modules/cons.py
index 2e81fb73eb313b56d16d7ec4b8297b8badcf06bb..f7b1159dad4ae9195ca9e0139d1e0a5462da9e63 100644 (file)
--- a/modules/cons.py
+++ b/modules/cons.py
@@ -13,6 +13,7 @@ class Connection:
         self.sock=sock
         self.authorized=authorized
         self.fileno=sock.fileno
+        self.name=""
         self.data=""
     def destroy(self):
         self.sock.close()

diff --git a/modules/ftpio.py b/modules/ftpio.py
index 7ccb88eaec34b1caadc451e84cf9c50b1ffefe59..14a032d4de1675df9635538061b3d6d2f50f2b44 100644 (file)
--- a/modules/ftpio.py
+++ b/modules/ftpio.py
@@ -13,10 +13,12 @@ if os.environ.has_key('HOME'):
 else:
     socketname=pubsock
 
-def connect():
+def connect(name=None):
     global sock
     sock=socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
     sock.connect(socketname)
+    if name:
+        sock.send('name %s\0' % name)
 
 def lock(path, hard=False):
     def dolock():
@@ -41,3 +43,6 @@ def unlock(path):
 def log(msg):
     sock.send('log1 %s\0' % msg)
 
+def name(newname):
+    sock.send('name %s\0' % newname)
+