Merge branch 'master' of github.com:ideal/mirror

Author: ideal

config/bjtu.ini

@@ -534,3 +534,15 @@ args       = --links --hard-links --times --verbose --delete --recursive
 twostage   = 0
 timeout    = 0
 priority   = 6
+
+[repoforge]
+upstream[] = mirror1.hs-esslingen.de
+command    = rsync
+exclude    = --exclude .~tmp~/
+time       = 50 */8 * * *
+rsyncdir   = repoforge/
+localdir   = /home/mirror/repoforge
+args       = --links --hard-links --times --verbose --delete --recursive
+twostage   = 0
+timeout    = 0
+priority   = 6

mirror/console.py

@@ -48,6 +48,12 @@ def list_task_queue():
 
     buffer = mmap.mmap(bufferfd, os.fstat(bufferfd).st_size,
                        mmap.MAP_SHARED, mmap.PROT_READ)
+    os.close(bufferfd)
+    if buffer[:2] != '\x79\x71':
+        write_stderr(_("Wrong file /tmp/mirrord, "
+                       "any other writed it?"))
+        return error.MIRROR_ERROR
+
     buffer.seek(2)
     size = struct.unpack("I", buffer.read(4))[0]
 
@@ -60,7 +66,6 @@ def list_task_queue():
               time.asctime(time.localtime(taskinfo.time)))
 
     buffer.close()
-    os.close(bufferfd)
     return error.MIRROR_OK
 
 signals = {

mirror/scheduler.py

@@ -275,16 +275,17 @@ def write_mmap(self):
         size = len(data) + 2 + 4
         if not hasattr(self, "buffer") or self.buffersz < size:
             self.buffersz = max(self.DEFAULT_BUFFER_SIZE, size)
-            if hasattr(self, "bufferfd"):
+            if hasattr(self, "buffer"):
                 self.buffer.close()
-                os.close(self.bufferfd)
             self.bufferfd = os.open("/tmp/mirrord",
                                     os.O_CREAT | os.O_TRUNC | os.O_RDWR,
                                     0o644)
             flag = fcntl.fcntl(self.bufferfd, fcntl.F_GETFD)
             fcntl.fcntl(self.bufferfd, fcntl.F_SETFD, flag | fcntl.FD_CLOEXEC)
             os.write(self.bufferfd, '\x00' * self.buffersz)
             self.buffer   = mmap.mmap(self.bufferfd, self.buffersz, mmap.MAP_SHARED, mmap.PROT_WRITE)
+            # close bufferfd
+            os.close(self.bufferfd)
             self.buffer.write("\x79\x71")
         self.buffer.seek(2)
         self.buffer.write(struct.pack("I", size))
@@ -295,7 +296,6 @@ def stop(self):
         if not hasattr(self, "buffer"):
             return
         self.buffer.close()
-        os.close(self.bufferfd)
         os.unlink("/tmp/mirrord")
 
     def append_timeout_task(self, taskname, task, time):