- all scripts use ftpiod for locking and logging

[projects/pld-ftp-admin.git] / bin / pfa-from-incoming

diff --git a/bin/pfa-from-incoming b/bin/pfa-from-incoming
index 4fe4d18878f632958c06bcbe2a97daaefe5c0d7f..c59cb3caadf6acd4220afc7fc3303653582f0e2f 100644 (file)
--- a/bin/pfa-from-incoming
+++ b/bin/pfa-from-incoming
@@ -8,23 +8,12 @@ import config
 from common import noarchcachedir, tmpdir, fileexists
 from baseftptree import BaseFtpTree, BasePkg
 cval=config.value
+import ftpio
 
-lockfile=os.environ['HOME']+'/pld-ftp-admin/var/lock-'+cval['default_to']
-
-def lock():
-    if not fileexists(lockfile):
-        open(lockfile, 'w').close()
-        return True
-    else:
-        return False
-
-def unlock():
-    rm(lockfile)
-
-def log(msg):
-    f=open(os.environ['HOME']+'/pld-ftp-admin/var/log', 'a')
-    f.write(msg+'\n')
-    f.close()
+try:
+    ftpio.connect('from-incoming')
+except:
+    sys.exit(0)
 
 def rm(file):
     os.remove(file)
@@ -53,8 +42,7 @@ def getcontent(file):
 
 ftptree=BaseFtpTree(cval['default_to'])
 
-if not lock():
-    log('Tree '+cval['default_to']+' locked')
+if not ftpio.lock(cval['default_to']):
     sys.exit(0)
 
 for uploadinfo in findfiles(incoming_dir+'SRPMS'):
@@ -66,7 +54,7 @@ for uploadinfo in findfiles(incoming_dir+'SRPMS'):
     srpm=pkg.files['SRPMS'][0]
 
     if ftptree.has_key(`pkg`):
-        log("%s already present in %s; removing newer files" %
+        ftpio.log("%s already present in %s; removing newer files" %
             (srpm, ftptree))
         rm(incoming_dir+'SRPMS/'+srpm)
         f=open(default_to+'SRPMS/.metadata/'+srpm+'.info', 'a')
@@ -176,7 +164,7 @@ for arch in ftp_archs:
         dstpkg=BasePkg(`srcpkg`, ftptree)
 
         if dstpkg.files.has_key(arch):
-            log("files from %s for arch %s already present in %s; removing newer files" % (`srcpkg`, arch, ftptree))
+            ftpio.log("files from %s for arch %s already present in %s; removing newer files" % (`srcpkg`, arch, ftptree))
             for rpm in srcpkg.files['ARCH']:
                 rm(incoming_dir+arch+'/'+rpm)
             rm(incoming_dir+arch+'/'+uploadinfo)
@@ -193,5 +181,5 @@ for arch in ftp_archs:
 
         rm(incoming_dir+arch+'/'+uploadinfo)
 
-unlock()
+ftpio.unlock(cval['default_to'])