This commit is contained in:
Maxime Beauchemin 2015-04-30 20:21:55 -07:00
Родитель e1ec304da6
Коммит 84ccfcf7bc
4 изменённых файлов: 8 добавлений и 4 удалений

Просмотреть файл

@ -250,7 +250,10 @@ def serve_logs(args):
def worker(args): def worker(args):
# Worker to serve static log files through this simple flask app # Worker to serve static log files through this simple flask app
sp = subprocess.Popen(['airflow', 'serve_logs']) sp = subprocess.Popen(
['airflow', 'serve_logs'],
env={'AIRFLOW_HOME': settings.AIRFLOW_HOME}
)
# Celery worker # Celery worker
from airflow.executors.celery_executor import app as celery_app from airflow.executors.celery_executor import app as celery_app

Просмотреть файл

@ -11,6 +11,7 @@ defaults = {
'base_url': 'http://localhost:8080', 'base_url': 'http://localhost:8080',
'web_server_host': '0.0.0.0', 'web_server_host': '0.0.0.0',
'web_server_port': '8080', 'web_server_port': '8080',
'authenticate': False,
}, },
'scheduler': { 'scheduler': {
'statsd_on': False, 'statsd_on': False,

Просмотреть файл

@ -63,7 +63,6 @@ def login(self, request):
if not user: if not user:
user = models.User( user = models.User(
username=DEFAULT_USERNAME, username=DEFAULT_USERNAME,
has_access=True,
is_superuser=True) is_superuser=True)
session.merge(user) session.merge(user)
session.expunge_all() session.expunge_all()

Просмотреть файл

@ -934,12 +934,12 @@ class BaseOperator(Base):
'_sa_instance_state', '_upstream_list', '_downstream_list', 'dag'} '_sa_instance_state', '_upstream_list', '_downstream_list', 'dag'}
for k in set(self.__dict__) - blacklist: for k in set(self.__dict__) - blacklist:
if self.__dict__[k] != other.__dict__[k]: if self.__dict__[k] != other.__dict__[k]:
logging.debug(str( logging.debug(str((
self.dag_id, self.dag_id,
self.task_id, self.task_id,
k, k,
self.__dict__[k], self.__dict__[k],
other.__dict__[k])) other.__dict__[k])))
return -1 return -1
return 0 return 0
@ -1426,6 +1426,7 @@ class DAG(Base):
# backdoor # backdoor
cls = self.__class__ cls = self.__class__
result = cls.__new__(cls) result = cls.__new__(cls)
setattr(result, '_sa_instance_state', getattr(self, '_sa_instance_state'))
memo[id(self)] = result memo[id(self)] = result
for k, v in self.__dict__.items(): for k, v in self.__dict__.items():
if k not in ('user_defined_macros', 'params'): if k not in ('user_defined_macros', 'params'):