Use journald for logging with systemd

appengine/gce-backend/agent/agent.py

 #!/usr/bin/python
 # Copyright 2015 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Sample Machine Provider agent."""
 
 import argparse
 import datetime
 import httplib2
@@ skipping 324 matching lines @@
 
 class SystemdAgent(Agent):
   """Machine Provider agent for systemd-based Linux distributions.
 
   The agent is installed for root.
   """
 
   AGENT_AUTOSTART_TEMPLATE = os.path.join(
       THIS_DIR, 'machine-provider-agent.service.tmpl')
   AGENT_AUTOSTART_PATH = '/etc/systemd/system/machine-provider-agent.service'
-  LOGS_DIR = '/var/log/messages/machine-provider-agent'
+  LOGS_DIR = '/var/log/machine-provider-agent'
   REBOOT_CMD = ('/sbin/shutdown', '-r', 'now')
   SWARMING_AUTOSTART_TEMPLATE = os.path.join(
       THIS_DIR, 'swarming-start-bot.service.tmpl')
   SWARMING_AUTOSTART_PATH = '/etc/systemd/system/swarming-start-bot.service'
   SWARMING_BOT_DIR = '/b/s'
 
+  def configure_logging(self):
+    """Sets up the logging."""
+    try:
+      from systemd.journal import JournalHandler
+      logger = logging.getLogger()
+      logger.setLevel(logging.DEBUG)
+      logger.addHandler(JournalHandler())
+    except ImportError:
+      super(Agent, self).configure_logging()
+
   def start(self):
     """Starts the Machine Provider agent."""
     subprocess.check_call(['systemctl', 'daemon-reload'])
     subprocess.check_call(['systemctl', 'enable', 'machine-provider-agent'])
     subprocess.check_call(['systemctl', 'start', 'machine-provider-agent'])
 
   def stop(self):
     """Stops the Machine Provider agent."""
     subprocess.check_call(['systemctl', 'stop', 'machine-provider-agent'])
 
@@ skipping 131 matching lines @@
   agent.configure_logging()
 
   if args.install:
     return agent.install()
 
   return agent.poll()
 
 
 if __name__ == '__main__':
   sys.exit(main())