celerybeat: Cooler splash screen, with more info

celery/apps/beat.py

@@ -7,13 +7,18 @@ from celery import __version__
 from celery import beat
 from celery import platforms
 from celery.log import emergency_error
-from celery.utils import info, LOG_LEVELS
+from celery.utils import get_full_cls_name, info, LOG_LEVELS
+from celery.utils.info import humanize_seconds
+from celery.utils import term
 
 STARTUP_INFO_FMT = """
 Configuration ->
     . broker -> %(conninfo)s
-    . schedule -> %(schedule)s
+    . loader -> %(loader)s
+    . scheduler -> %(scheduler)s
+%(scheduler_info)s
     . logfile -> %(logfile)s@%(loglevel)s
+    . maxinterval -> %(hmax_interval)s (%(max_interval)ss)
 """.strip()
 
 
@@ -35,21 +40,17 @@ class Beat(object):
         self.scheduler_cls = scheduler_cls or defaults.CELERYBEAT_SCHEDULER
         self.max_interval = max_interval
         self.socket_timeout = socket_timeout
+        self.colored = term.colored(enabled=defaults.CELERYD_LOG_COLOR)
 
         if not isinstance(self.loglevel, int):
             self.loglevel = LOG_LEVELS[self.loglevel.upper()]
 
     def run(self):
         logger = self.setup_logging()
-        print("celerybeat v%s is starting." % __version__)
+        print(str(self.colored.magenta(
+                    "celerybeat v%s is starting." % __version__)))
         self.init_loader()
-        print(self.startup_info())
         self.set_process_title()
-        if self.socket_timeout:
-            logger.debug("Setting default socket timeout to %r" % (
-                self.socket_timeout))
-            socket.setdefaulttimeout(self.socket_timeout)
-        print("celerybeat has started.")
         self.start_scheduler(logger)
 
     def setup_logging(self):
@@ -62,11 +63,20 @@ class Beat(object):
         return logger
 
     def start_scheduler(self, logger=None):
+        c = self.colored
         beat = self.Service(logger=logger,
                             max_interval=self.max_interval,
                             scheduler_cls=self.scheduler_cls,
                             schedule_filename=self.schedule)
 
+        print(str(c.blue("__    ", c.red("-"),
+                  c.blue("    ... __   "), c.red("-"),
+                  c.blue("        _\n"),
+                  c.reset(self.startup_info(beat)))))
+        if self.socket_timeout:
+            logger.debug("Setting default socket timeout to %r" % (
+                self.socket_timeout))
+            socket.setdefaulttimeout(self.socket_timeout)
         try:
             self.install_sync_handler(beat)
             beat.start()
@@ -79,14 +89,19 @@ class Beat(object):
         # Run the worker init handler.
         # (Usually imports task modules and such.)
         from celery.loaders import current_loader
-        current_loader().init_worker()
+        self.loader = current_loader()
+        self.loader.init_worker()
 
-    def startup_info(self):
+    def startup_info(self, beat):
         return STARTUP_INFO_FMT % {
             "conninfo": info.format_broker_info(),
-            "logfile": self.logfile or "@stderr",
+            "logfile": self.logfile or "[stderr]",
             "loglevel": LOG_LEVELS[self.loglevel],
-            "schedule": self.schedule,
+            "loader": get_full_cls_name(self.loader.__class__),
+            "scheduler": get_full_cls_name(beat.scheduler.__class__),
+            "scheduler_info": beat.scheduler.info,
+            "hmax_interval": humanize_seconds(beat.max_interval),
+            "max_interval": beat.max_interval,
         }
 
     def set_process_title(self):

celery/beat.py

@@ -254,6 +254,10 @@ class Scheduler(UserDict):
     def schedule(self):
         return self.get_schedule()
 
+    @property
+    def info(self):
+        return ""
+
 
 class PersistentScheduler(Scheduler):
     persistence = shelve
@@ -280,6 +284,10 @@ class PersistentScheduler(Scheduler):
         self.sync()
         self._store.close()
 
+    @property
+    def info(self):
+        return "    . db -> %s" % (self.schedule_filename, )
+
 
 class Service(object):
     scheduler_cls = PersistentScheduler