Pārlūkot izejas kodu

[task] Connector support

Romain Rigaux 4 gadi atpakaļ
vecāks
revīzija
ace5092754

+ 9 - 2
desktop/core/src/desktop/management/commands/runcelery.py

@@ -66,8 +66,15 @@ class Command(BaseCommand):
     return SERVER_HELP
 
 def runcelery(*args, **options):
-  #CeleryCommand().handle_argv(['worker', '--app=desktop.celery', '--concurrency=1', '--loglevel=DEBUG'])
-  opts = ['runcelery', 'worker', '--app=' + options['app'], '--concurrency=' + str(options['concurrency']), '--loglevel=' + options['loglevel']]
+  # Native does not load Hue's config
+  # CeleryCommand().handle_argv(['worker', '--app=desktop.celery', '--concurrency=1', '--loglevel=DEBUG'])
+  opts = [
+      'runcelery',
+      'worker',
+      '--app=' + options['app'],
+      '--concurrency=' + str(options['concurrency']),
+      '--loglevel=' + options['loglevel']
+  ]
   drop_privileges_if_necessary(CELERY_OPTIONS)
 
   if conf.DEV.get():

+ 2 - 0
desktop/libs/notebook/src/notebook/models.py

@@ -556,6 +556,8 @@ class ApiWrapper():
         def _method(*args, **kwargs):
           return attr(*args, **dict(kwargs, postdict=self.request.POST, user_id=self.request.user.id))
         return _method
+      else:
+        LOG.debug('Skipping Task Server call %s' % name)
     return getattr(self.api, name)
 
 

+ 4 - 1
desktop/libs/notebook/src/notebook/tasks.py

@@ -493,7 +493,10 @@ def _cleanup(notebook, snippet):
 
 def _get_query_key(notebook, snippet):
   if ENABLE_NOTEBOOK_2.get():
-    query_key = snippet['executor']['executables'][0].get('history', {}).get('uuid')
+    if snippet.get('executable'):
+      query_key = snippet['executable']['id']
+    else:
+      query_key = snippet['executor']['executables'][0].get('history', {}).get('uuid')
   else:
     query_key = notebook['uuid']