#1162 backend: put PID to log output, and add log_format option
Merged 4 years ago by msuchy. Opened 4 years ago by praiskup.
Unknown source log-format-backend  into  master

file modified
+1 -1
@@ -38,6 +38,6 @@

  LOG_PUB_SUB = "copr:backend:log:pubsub::"

  

  default_log_format = Formatter(

-     '[%(asctime)s][%(levelname)6s][%(name)10s][%(filename)s:%(funcName)s:%(lineno)d] %(message)s')

+     '[%(asctime)s][%(levelname)6s][PID:%(process)d][%(name)10s][%(filename)s:%(funcName)s:%(lineno)d] %(message)s')

  build_log_format = Formatter(

      '[%(asctime)s][%(levelname)6s][PID:%(process)d] %(message)s')

@@ -11,7 +11,6 @@

  # TODO: remove when RedisLogHandler works fine

  from .. import constants

  from .. import helpers

- from ..constants import default_log_format

  

  

  class RedisLogHandler(object):
@@ -35,7 +34,7 @@

          self.main_logger = logging.Logger("logger", level=logging.DEBUG)

          self.main_handler = logging.handlers.WatchedFileHandler(

              filename=os.path.join(self.log_dir, "logger.log"))

-         self.main_handler.setFormatter(default_log_format)

+         self.main_handler.setFormatter(self.opts.log_format)

          self.main_logger.addHandler(self.main_handler)

  

          level = getattr(logging, self.opts.log_level.upper(), None)
@@ -45,7 +44,7 @@

              logger = logging.Logger(component)

              handler = logging.handlers.WatchedFileHandler(

                  filename=os.path.join(self.log_dir, "{}.log".format(component)))

-             handler.setFormatter(default_log_format)

+             handler.setFormatter(self.opts.log_format)

              handler.setLevel(level)

              logger.addHandler(handler)

              self.loggers[component] = logger

@@ -277,6 +277,8 @@

              cp, "backend", "log_dir", "/var/log/copr-backend/")

          opts.log_level = _get_conf(

              cp, "backend", "log_level", "info")

+         opts.log_format = _get_conf(

+             cp, "backend", "log_format", default_log_format)

          opts.verbose = _get_conf(

              cp, "backend", "verbose", False, mode="bool")

  

@@ -82,6 +82,7 @@

  # logging settings

  # log_dir=/var/log/copr-backend/

  # log_level=info

+ # log_format=[%(asctime)s][%(levelname)6s][PID:%(process)d][%(name)10s][%(filename)s:%(funcName)s:%(lineno)d] %(message)s

  

  # verbose=False

  

In #987 we are loosing the processes' log outputs in the middle of
worker execution, without being sure the process really ended or not.
Sometimes it would be nice to check that the process really doesn't
exist so we need to be able to identify it.

Relates: #987

rebased onto f11323d

4 years ago

Pull-Request has been merged by msuchy

4 years ago