Remove settings *_LOG_LEVEL, *_LOG_FILE scheduled for removal in 4.0.

celery/app/defaults.py

@@ -39,11 +39,6 @@ DEFAULT_LOG_FMT = '[%(asctime)s: %(levelname)s] %(message)s'
 DEFAULT_TASK_LOG_FMT = """[%(asctime)s: %(levelname)s/%(processName)s] \
 %(task_name)s[%(task_id)s]: %(message)s"""
 
-_BROKER_OLD = {'deprecate_by': '2.5', 'remove_by': '4.0',
-               'alt': 'BROKER_URL setting'}
-_REDIS_OLD = {'deprecate_by': '2.5', 'remove_by': '4.0',
-              'alt': 'URL form of CELERY_RESULT_BACKEND'}
-
 searchresult = namedtuple('searchresult', ('namespace', 'key', 'type'))
 
 
@@ -81,11 +76,11 @@ NAMESPACES = {
         'USE_SSL': Option(False, type='bool'),
         'TRANSPORT': Option(type='string'),
         'TRANSPORT_OPTIONS': Option({}, type='dict'),
-        'HOST': Option(type='string', **_BROKER_OLD),
-        'PORT': Option(type='int', **_BROKER_OLD),
-        'USER': Option(type='string', **_BROKER_OLD),
-        'PASSWORD': Option(type='string', **_BROKER_OLD),
-        'VHOST': Option(type='string', **_BROKER_OLD),
+        'HOST': Option(type='string'),
+        'PORT': Option(type='int'),
+        'USER': Option(type='string'),
+        'PASSWORD': Option(type='string'),
+        'VHOST': Option(type='string'),
     },
     'CASSANDRA': {
         'COLUMN_FAMILY': Option(type='string'),
@@ -129,10 +124,10 @@ NAMESPACES = {
         'MAX_CACHED_RESULTS': Option(100, type='int'),
         'MESSAGE_COMPRESSION': Option(type='string'),
         'MONGODB_BACKEND_SETTINGS': Option(type='dict'),
-        'REDIS_HOST': Option(type='string', **_REDIS_OLD),
-        'REDIS_PORT': Option(type='int', **_REDIS_OLD),
-        'REDIS_DB': Option(type='int', **_REDIS_OLD),
-        'REDIS_PASSWORD': Option(type='string', **_REDIS_OLD),
+        'REDIS_HOST': Option(type='string'),
+        'REDIS_PORT': Option(type='int'),
+        'REDIS_DB': Option(type='int'),
+        'REDIS_PASSWORD': Option(type='string'),
         'REDIS_MAX_CONNECTIONS': Option(type='int'),
         'REJECT_ON_WORKER_LOST': Option(type='bool'),
         'RESULT_BACKEND': Option(type='string'),
@@ -183,10 +178,6 @@ NAMESPACES = {
         'CONSUMER': Option('celery.worker.consumer:Consumer', type='string'),
         'LOG_FORMAT': Option(DEFAULT_PROCESS_LOG_FMT),
         'LOG_COLOR': Option(type='bool'),
-        'LOG_LEVEL': Option('WARN', deprecate_by='2.4', remove_by='4.0',
-                            alt='--loglevel argument'),
-        'LOG_FILE': Option(deprecate_by='2.4', remove_by='4.0',
-                           alt='--logfile argument'),
         'MAX_TASKS_PER_CHILD': Option(type='int'),
         'POOL': Option(DEFAULT_POOL),
         'POOL_PUTLOCKS': Option(True, type='bool'),
@@ -204,17 +195,6 @@ NAMESPACES = {
         'SCHEDULE_FILENAME': Option('celerybeat-schedule'),
         'SYNC_EVERY': Option(0, type='int'),
         'MAX_LOOP_INTERVAL': Option(0, type='float'),
-        'LOG_LEVEL': Option('INFO', deprecate_by='2.4', remove_by='4.0',
-                            alt='--loglevel argument'),
-        'LOG_FILE': Option(deprecate_by='2.4', remove_by='4.0',
-                           alt='--logfile argument'),
-    },
-    'CELERYMON': {
-        'LOG_LEVEL': Option('INFO', deprecate_by='2.4', remove_by='4.0',
-                            alt='--loglevel argument'),
-        'LOG_FILE': Option(deprecate_by='2.4', remove_by='4.0',
-                           alt='--logfile argument'),
-        'LOG_FORMAT': Option(DEFAULT_LOG_FMT),
     },
     'EMAIL': {
         'HOST': Option('localhost'),

celery/app/log.py

@@ -58,7 +58,7 @@ class Logging(object):
 
     def __init__(self, app):
         self.app = app
-        self.loglevel = mlevel(self.app.conf.CELERYD_LOG_LEVEL)
+        self.loglevel = mlevel(logging.WARN)
         self.format = self.app.conf.CELERYD_LOG_FORMAT
         self.task_format = self.app.conf.CELERYD_TASK_LOG_FORMAT
         self.colorize = self.app.conf.CELERYD_LOG_COLOR

celery/apps/beat.py

@@ -43,13 +43,13 @@ class Beat(object):
 
     def __init__(self, max_interval=None, app=None,
                  socket_timeout=30, pidfile=None, no_color=None,
-                 loglevel=None, logfile=None, schedule=None,
+                 loglevel='WARN', logfile=None, schedule=None,
                  scheduler_cls=None, redirect_stdouts=None,
                  redirect_stdouts_level=None, **kwargs):
         """Starts the beat task scheduler."""
         self.app = app = app or self.app
-        self.loglevel = self._getopt('log_level', loglevel)
-        self.logfile = self._getopt('log_file', logfile)
+        self.loglevel = loglevel
+        self.logfile = logfile
         self.schedule = self._getopt('schedule_filename', schedule)
         self.scheduler_cls = self._getopt('scheduler', scheduler_cls)
         self.redirect_stdouts = self._getopt(

celery/bin/beat.py

@@ -87,7 +87,7 @@ class beat(Command):
                     default=c.CELERYBEAT_SCHEDULE_FILENAME),
              Option('--max-interval', type='float'),
              Option('-S', '--scheduler', dest='scheduler_cls'),
-             Option('-l', '--loglevel', default=c.CELERYBEAT_LOG_LEVEL)) +
+             Option('-l', '--loglevel', default='WARN')) +
             daemon_options(default_pidfile='celerybeat.pid') +
             tuple(self.app.user_options['beat'])
         )

celery/bin/worker.py

@@ -226,7 +226,7 @@ class worker(Command):
                    default=conf.CELERYD_CONCURRENCY, type='int'),
             Option('-P', '--pool', default=conf.CELERYD_POOL, dest='pool_cls'),
             Option('--purge', '--discard', default=False, action='store_true'),
-            Option('-l', '--loglevel', default=conf.CELERYD_LOG_LEVEL),
+            Option('-l', '--loglevel', default='WARN'),
             Option('-n', '--hostname'),
             Option('-B', '--beat', action='store_true'),
             Option('-s', '--schedule', dest='schedule_filename',

celery/tests/app/test_defaults.py

@@ -37,13 +37,6 @@ class test_defaults(AppCase):
             with pypy_version((1, 5, 0)):
                 self.assertEqual(self.defaults.DEFAULT_POOL, 'prefork')
 
-    def test_deprecated(self):
-        source = Mock()
-        source.CELERYD_LOG_LEVEL = 2
-        with patch('celery.utils.warn_deprecated') as warn:
-            self.defaults.find_deprecated_settings(source)
-            self.assertTrue(warn.called)
-
     def test_default_pool_jython(self):
         with sys_platform('java 1.6.51'):
             self.assertEqual(self.defaults.DEFAULT_POOL, 'threads')

celery/worker/__init__.py

@@ -352,9 +352,9 @@ class WorkController(object):
                        task_time_limit=None, task_soft_time_limit=None,
                        max_tasks_per_child=None, prefetch_multiplier=None,
                        disable_rate_limits=None, worker_lost_wait=None, **_kw):
+        self.loglevel = loglevel
+        self.logfile = logfile
         self.concurrency = self._getopt('concurrency', concurrency)
-        self.loglevel = self._getopt('log_level', loglevel)
-        self.logfile = self._getopt('log_file', logfile)
         self.send_events = self._getopt('send_events', send_events)
         self.pool_cls = self._getopt('pool', pool_cls)
         self.consumer_cls = self._getopt('consumer', consumer_cls)