fix(logger): fix logging name

api/__init__.py

@@ -73,8 +73,6 @@
     "create_accesskey": (0b10000, "Create access key"),
 }
 
-_logger = logging.getLogger("api")
-
 
 class APIBaseHandler(tornado.web.RequestHandler):
     """APIBaseHandler class to precess REST requests
@@ -225,7 +223,7 @@ def send_response(self, status_code=200, data=None, headers=None):
     def finish(self, chunk=None):
         super(APIBaseHandler, self).finish(chunk)
         self._time_end = time.time()
-        _logger.info(
+        logging.info(
             "%s call ends %s" % (type(self).__name__, self._time_end - self._time_start)
         )
 
@@ -615,5 +613,5 @@ def post(self):
         self.add_to_log("%s broadcast" % self.appname, alert, "important")
         self.application.send_broadcast(self.appname, self.db, channel, alert)
         delta_t = time.time() - self._time_start
-        _logger.info("Broadcast took time: %sms" % (delta_t * 1000))
+        logging.info("Broadcast took time: %sms" % (delta_t * 1000))
         self.send_response(OK, dict(status="ok"))

api/push.py

@@ -43,8 +43,6 @@
 import traceback
 import tornado
 
-_logger = logging.getLogger("push")
-
 
 @route(r"/api/v2/push[\/]?")
 class PushHandler(APIBaseHandler):
@@ -79,7 +77,7 @@ async def post(self):
                     proc = import_module("hooks." + extra["processor"])
                     request_dict = proc.process_pushnotification_payload(request_dict)
                 except Exception as ex:
-                    _logger.error(str(ex))
+                    logging.error(str(ex))
                     self.send_response(BAD_REQUEST, dict(error=str(ex)))
                     return
 
@@ -105,11 +103,11 @@ async def post(self):
                     # TODO check permission to insert
                     self.db.tokens.insert(token)
                 except Exception as ex:
-                    _logger.error(str(ex))
+                    logging.error(str(ex))
                     self.send_response(INTERNAL_SERVER_ERROR, dict(error=str(ex)))
                     return
 
-            _logger.info("sending notification to %s: %s" % (device, self.token))
+            logging.info("sending notification to %s: %s" % (device, self.token))
             #  if device in [DEVICE_TYPE_FCM, DEVICE_TYPE_ANDROID]:
             if device.endswith(DEVICE_TYPE_FCM):
                 fcm_payload = request_dict.get("fcm", {})
@@ -119,7 +117,7 @@ async def post(self):
                         token=self.token, alert=alert, extra=extra, payload=fcm_payload
                     )
                 except Exception as ex:
-                    _logger.error(str(ex))
+                    logging.error(str(ex))
                     statuscode = ex.response_statuscode
                     self.send_response(
                         statuscode, dict(error="error response from fcm")
@@ -142,7 +140,7 @@ async def post(self):
                 if conn:
                     conn.process(token=self.token, alert=alert, extra=extra, apns=apns)
                 else:
-                    _logger.error("no active apns connection")
+                    logging.error("no active apns connection")
             elif device == DEVICE_TYPE_WNS:
                 request_dict.setdefault("wns", {})
                 wns = self.wnsconnections[self.app["shortname"]][0]
@@ -153,7 +151,7 @@ async def post(self):
                     wns=request_dict["wns"],
                 )
             else:
-                _logger.error("invalid device type %s" % device)
+                logging.error("invalid device type %s" % device)
                 self.send_response(BAD_REQUEST, dict(error="Invalid device type"))
                 return
 
@@ -165,5 +163,5 @@ async def post(self):
             self.send_response(ACCEPTED)
         except Exception as ex:
             traceback_ex = traceback.format_exc()
-            _logger.error("%s %s" % (traceback_ex, str(ex)))
+            logging.error("%s %s" % (traceback_ex, str(ex)))
             self.send_response(INTERNAL_SERVER_ERROR, dict(error=str(ex)))

app.py

@@ -37,6 +37,7 @@
 from tornado.options import define, options
 from web import WebApplication
 import os
+import logging
 
 
 define("appprefix", default="", help="DB name prefix")
@@ -63,22 +64,20 @@
     if os.path.isfile(loggingconfigfile):
         logging.config.fileConfig(loggingconfigfile)
 
-    _logger = logging.getLogger("app")
-
     options.parse_config_file("config.py")
     options.parse_command_line()
 
     if options.sentrydsn:
         sentry_sdk.init(dsn=options.sentrydsn, integrations=[TornadoIntegration()])
     else:
-        _logger.warn("Sentry dsn is not set")
+        logging.warn("Sentry dsn is not set")
 
     mongodb = None
     while not mongodb:
         try:
             mongodb = pymongo.MongoClient(options.mongouri)
-        except Exception as ex:
-            _logger.error(ex)
+        except:
+            logging.error("Cannot not connect to MongoDB")
 
     masterdb = mongodb[options.masterdb]
     services = init_messaging_agents(masterdb)

controllers/keys.py

@@ -32,8 +32,6 @@
 from util import *
 import logging
 
-_logger = logging.getLogger()
-
 
 @route(r"/applications/([^/]+)/keys")
 class AppAccessKeysHandler(WebBaseHandler):

controllers/settings.py

@@ -49,8 +49,6 @@
 import traceback
 from controllers.base import *
 
-_logger = logging.getLogger()
-
 
 @route(r"/applications/([^/]+)/settings[\/]?")
 class AppHandler(WebBaseHandler):
@@ -162,7 +160,6 @@ def post(self, appname):
                     instanceid=0,
                 )
                 self.fcmconnections[app["shortname"]] = [fcm]
-                _logger.info(fcm)
 
             if self.get_argument("connections", None):
                 """If this value is greater than current apns connections,
@@ -178,12 +175,12 @@ def post(self, appname):
                 self.perform_feedback(app)
 
             if self.get_argument("launchapns", None):
-                _logger.info("Start APNS")
+                logging.info("Start APNS")
                 app["enableapns"] = 1
                 self.start_apns(app)
 
             if self.get_argument("stopapns", None):
-                _logger.info("Shutdown APNS")
+                logging.info("Shutdown APNS")
                 app["enableapns"] = 0
                 self.stop_apns(app)
 
@@ -236,5 +233,5 @@ def post(self, appname):
             self.masterdb.applications.update({"shortname": self.appname}, app)
             self.redirect(r"/applications/%s/settings" % self.appname)
         except Exception as ex:
-            _logger.error(traceback.format_exc())
+            logging.error(traceback.format_exc())
             self.render("app_settings.html", app=app, error=str(ex))

logging.ini-sample

@@ -1,34 +1,30 @@
 [loggers]
-keys=root,tornado_access,push,apns,fcm
+keys=root,tornado_access,tornado_general,tornado_app
 
 [logger_root]
-handlers=console
+handlers=main,console
 qualname=root
 
 [logger_tornado_access]
 ; tornado web access logger
 propagate=0
-handlers=accesslog
+handlers=accesslog,console
 qualname=tornado.access
 
-[logger_push]
-; controller logger
-handlers=pushlog
-qualname=push
-
-[logger_apns]
-; apns logger
+[logger_tornado_general]
+; tornado web access logger
 propagate=0
-handlers=pushlog
-qualname=apns
+handlers=main,console
+qualname=tornado.general
 
-[logger_fcm]
-; fcm logger
-handlers=pushlog
-qualname=fcm
+[logger_tornado_app]
+; tornado web access logger
+propagate=0
+handlers=main,console
+qualname=tornado.application
 
 [handlers]
-keys=console,silent,accesslog,main,pushlog
+keys=console,silent,accesslog,main
 
 [handler_console]
 class = StreamHandler
@@ -49,13 +45,6 @@ formatter = default
 class=handlers.TimedRotatingFileHandler
 args=('/var/log/airnotifier/main.log', 'H', 24, 50)
 
-[handler_pushlog]
-formatter = default
-# 2000 maxBytes 100 backups
-class=handlers.TimedRotatingFileHandler
-args=('/var/log/airnotifier/push.log', 'H', 24, 50)
-
-
 [handler_silent]
 class=StreamHandler
 level=WARNING

logging.ini-loggly → logging.ini-syslog

@@ -1,5 +1,5 @@
 [loggers]
-keys=root,tornado_access,push,apns,fcm
+keys=root,tornado_access,tornado_general,tornado_app
 
 [logger_root]
 handlers=syslog,console
@@ -11,21 +11,17 @@ propagate=0
 handlers=syslog,console
 qualname=tornado.access
 
-[logger_push]
-; controller logger
-handlers=syslog,console
-qualname=push
-
-[logger_apns]
-; apns logger
+[logger_tornado_general]
+; tornado web access logger
 propagate=0
 handlers=syslog,console
-qualname=apns
+qualname=tornado.general
 
-[logger_fcm]
-; fcm logger
+[logger_tornado_app]
+; tornado web access logger
+propagate=0
 handlers=syslog,console
-qualname=fcm
+qualname=tornado.application
 
 [handlers]
 keys=syslog,console
@@ -39,13 +35,18 @@ level = DEBUG
 [handler_console]
 class = StreamHandler
 args = (sys.stdout,)
-formatter = loggly
+formatter = console
 level = DEBUG
 
 [formatters]
-keys=loggly
+keys=loggly,console
 
 [formatter_loggly]
 datefmt = %s
 class=logging.Formatter
 format = Python: { "loggerName":"%(name)s", "timestamp":"%(asctime)s", "pathName":"%(pathname)s", "logRecordCreationTime":"%(created)f", "functionName":"%(funcName)s", "levelNo":"%(levelno)s", "lineNo":"%(lineno)d", "time":"%(msecs)d", "levelName":"%(levelname)s", "message":"%(message)s"}
+
+[formatter_console]
+datefmt = %s
+class=logging.Formatter
+format = %(asctime)s %(name)s %(levelname)-1.1s [%(threadName)s][%(name)s][%(filename)s:%(lineno)s] %(message)s