[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-136-g8044a78

[X2Go dev team]

The branch, master has been updated
       via  8044a7866409621d72fed6ddcd3c496c1f7acbbe (commit)
      from  617d046c3864d73e91aa4f6701a27d43445f1562 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8044a7866409621d72fed6ddcd3c496c1f7acbbe
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 20 16:16:26 2013 +0100

    move log message to a place where it makes sense

-----------------------------------------------------------------------

Summary of changes:
 bin/x2gobroker |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

The diff of changes is:
diff --git a/bin/x2gobroker b/bin/x2gobroker
index 4f646dc..287f0c7 100755
--- a/bin/x2gobroker
+++ b/bin/x2gobroker
@@ -253,7 +253,6 @@ if __name__ == "__main__":
         import tornado.ioloop
 
         def launch_ioloop():
-            logger_broker.info('Forking daemon to background, PID file is: {pidfile}'.format(pidfile=pidfile))
             tornado.ioloop.IOLoop.instance().start()
 
         application = tornado.web.Application(urls, **settings)
@@ -276,6 +275,7 @@ if __name__ == "__main__":
                 keep_fds = [int(fd) for fd in os.listdir('/proc/self/fd') if fd not in (0,1,2) ]
                 daemon_stdout = file(daemon_logdir+'x2gobroker-daemon.stdout', 'w+')
                 daemon_stderr = file(daemon_logdir+'x2gobroker-daemon.stderr', 'w+')
+                logger_broker.info('Forking daemon to background, PID file is: {pidfile}'.format(pidfile=pidfile))
                 with daemon.DaemonContext(stdout=daemon_stdout, stderr=daemon_stderr, files_preserve=keep_fds, umask=0o027, pidfile=lockfile.FileLock(pidfile)):
                     file(pidfile, 'w+').write(str(os.getpid())+'\n')
                     launch_ioloop()


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).