und weiter ...

git-svn-id: http://svn.brehm-online.com/svn/my-stuff/python/PyLogrotate/trunk@243 ec8d2aa5-1599-4edb-8739-2b3a1bc399aa

diff --git a/LogRotateGetopts.py b/LogRotateGetopts.py
index fc67766f50a65c9fd14c8e6a0a1ee1bd34e89cd5..0ba032d4b45150c3d60fda1d7d38ff9c879b1d5e 100755 (executable)
--- a/LogRotateGetopts.py
+++ b/LogRotateGetopts.py
@@ -225,6 +225,14 @@ class LogrotateOptParser(object):
             help    = _('Path of state file (different to configuration)'),
         )
 
+        self.parser.add_option(
+            '--pid-file',
+            '-P',
+            dest    = "pidfile",
+            metavar = 'FILE',
+            help    = _('Path of PID file (different to configuration)'),
+        )
+
         self.parser.add_option(
             '--mail',
             '-m',

diff --git a/LogRotateHandler.py b/LogRotateHandler.py
index 4c89d339ba9b580b029167a567405594d35ff8fd..053899d2e0545fe0044baacbd2caad6f3d3a278f 100755 (executable)
--- a/LogRotateHandler.py
+++ b/LogRotateHandler.py
@@ -59,6 +59,7 @@ class LogrotateHandler(object):
                         verbose    = 0,
                         force      = False,
                         state_file = None,
+                        pid_file   = None,
                         mail_cmd   = None,
                         local_dir  = None,
     ):
@@ -75,6 +76,8 @@ class LogrotateHandler(object):
         @type force:        bool
         @param state_file:  Path of state file (different to configuration)
         @type state_file:   str or None
+        @param pid_file:    Path of PID file (different to configuration)
+        @type pid_file:     str or None
         @param mail_cmd:    command to send mail (instead of using
                             the Phyton email package)
         @type mail_cmd:     str or None
@@ -128,6 +131,12 @@ class LogrotateHandler(object):
         @type: str
         '''
 
+        self.pid_file = pid_file
+        '''
+        @ivar: Path of PID file (from commandline or from configuration)
+        @type: str
+        '''
+
         self.mail_cmd = mail_cmd
         '''
         @ivar: command to send mail (instead of using the Phyton email package)
@@ -208,6 +217,7 @@ class LogrotateHandler(object):
             'mail_cmd':    self.mail_cmd,
             'scripts':     self.scripts,
             'state_file':  self.state_file,
+            'pid_file':    self.pid_file,
             'test':        self.test,
             'verbose':     self.verbose,
         }

diff --git a/po/LogRotateGetopts.de.po b/po/LogRotateGetopts.de.po
index bdd5154393877a82c1d049e52213a5c9ea0a3571..b6e32b739f1fba7084b39fff4d0f09b72bd2bbdf 100644 (file)
--- a/po/LogRotateGetopts.de.po
+++ b/po/LogRotateGetopts.de.po
@@ -54,6 +54,10 @@ msgstr "Überprüft nur die gegebene Konfigurationsdatei und führt nichts aus.
 msgid "Path of state file (different to configuration)"
 msgstr "Pfad zur Statusdatei (im Unterschied zur Konfiguration)"
 
+#: LogRotateGetopts.py:228
+msgid "Path of PID file (different to configuration)"
+msgstr "Pfad zur PID-Datei (im Unterschied zur Konfiguration)"
+
 #: LogRotateGetopts.py:233
 msgid "Command to send mail (instead of using the Phyton email package)"
 msgstr "Befehl zum Mailversand (anstelle der Verwendung des Python email-Paketes"

diff --git a/po/LogRotateGetopts.pot b/po/LogRotateGetopts.pot
index bed1a1513fb15ce9a4144420a533078c888e83b5..f2ac9ad76e71b7a324d4e69dc97552a706da7042 100644 (file)
--- a/po/LogRotateGetopts.pot
+++ b/po/LogRotateGetopts.pot
@@ -53,6 +53,10 @@ msgstr ""
 msgid "Path of state file (different to configuration)"
 msgstr ""
 
+#: LogRotateGetopts.py:228
+msgid "Path of PID file (different to configuration)"
+msgstr ""
+
 #: LogRotateGetopts.py:233
 msgid "Command to send mail (instead of using the Phyton email package)"
 msgstr ""