[CalendarServer-changes] [14769] CalendarServer/trunk/txdav/base/datastore/subpostgres.py

[source_changes at macosforge.org]

Revision: 14769
          http://trac.calendarserver.org//changeset/14769
Author:   sagen at apple.com
Date:     2015-05-06 12:22:50 -0700 (Wed, 06 May 2015)
Log Message:
-----------
Fix pgctl stop

Modified Paths:
--------------
    CalendarServer/trunk/txdav/base/datastore/subpostgres.py

Modified: CalendarServer/trunk/txdav/base/datastore/subpostgres.py
===================================================================
--- CalendarServer/trunk/txdav/base/datastore/subpostgres.py	2015-05-05 19:09:59 UTC (rev 14768)
+++ CalendarServer/trunk/txdav/base/datastore/subpostgres.py	2015-05-06 19:22:50 UTC (rev 14769)
@@ -658,10 +658,14 @@
             # database.  (This also happens in command-line tools.)
             if self.shouldStopDatabase:
                 monitor = PostgresMonitor()
-                # FIXME: why is this 'logfile' and not self.logfile?
+                args = [
+                    self._pgCtl, "stop",
+                    "--log={}".format(self.logFile),
+                ]
+                log.info("Requesting postgres stop via: {args}", args=args)
                 self.reactor.spawnProcess(
                     monitor, self._pgCtl,
-                    [self._pgCtl, "-l", "logfile", "stop"],
+                    args,
                     env=self.env, path=self.workingDir.path,
                     uid=self.uid, gid=self.gid,
                 )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150506/bdaa593c/attachment.html>