From 735b4f2cd02110e4ceb2eada455317a073520080 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Tue, 24 Feb 2015 23:21:31 -0500
Subject: [PATCH] Move pulsar/daemon.py to pulsar/main.py.
- No longer needs to act as a daemon so the old name didn't make sense.
- A bunch of scripts depend on importing this - so the new name makes those imports less confusing as well.
---
pulsar/{daemon.py => main.py} | 30 +++++++++++------------
pulsar/mesos/framework.py | 2 +-
pulsar/scripts/chown_working_directory.py | 2 +-
pulsar/scripts/drmaa_kill.py | 2 +-
pulsar/scripts/drmaa_launch.py | 2 +-
pulsar/scripts/mesos_executor.py | 2 +-
pulsar/scripts/mesos_framework.py | 2 +-
pulsar/scripts/submit.py | 4 +--
pulsar/web/wsgi.py | 2 +-
9 files changed, 24 insertions(+), 24 deletions(-)
rename pulsar/{daemon.py => main.py} (98%)
diff --git a/pulsar/daemon.py b/pulsar/main.py
similarity index 98%
rename from pulsar/daemon.py
rename to pulsar/main.py
index f235388b..0df9d940 100644
--- a/pulsar/daemon.py
+++ b/pulsar/main.py
@@ -1,7 +1,3 @@
-""" daemon.py no longer makes sense as a filename for this file at all.
-It really should be main.py to reflect what it is doing and sync with
-Galaxy.
-"""
import logging
from logging.config import fileConfig
@@ -93,16 +89,7 @@ def load_pulsar_app(
def app_loop(args, log):
- try:
- config_builder = PulsarConfigBuilder(args)
- pulsar_app = load_pulsar_app(
- config_builder,
- config_env=True,
- log=log,
- )
- except BaseException:
- log.exception("Failed to initialize Pulsar application")
- raise
+ pulsar_app = _app(args, log)
sleep = True
while sleep:
try:
@@ -113,7 +100,6 @@ def app_loop(args, log):
sleep = False
except Exception:
pass
-
try:
pulsar_app.shutdown()
except Exception:
@@ -121,6 +107,20 @@ def app_loop(args, log):
raise
+def _app(args, log):
+ try:
+ config_builder = PulsarConfigBuilder(args)
+ pulsar_app = load_pulsar_app(
+ config_builder,
+ config_env=True,
+ log=log,
+ )
+ except BaseException:
+ log.exception("Failed to initialize Pulsar application")
+ raise
+ return pulsar_app
+
+
def absolute_config_path(path, pulsar_root):
if path and not os.path.isabs(path):
path = os.path.join(pulsar_root, path)
diff --git a/pulsar/mesos/framework.py b/pulsar/mesos/framework.py
index 5a3f3cc4..ca04de78 100644
--- a/pulsar/mesos/framework.py
+++ b/pulsar/mesos/framework.py
@@ -9,7 +9,7 @@ from pulsar.mesos import (
)
from pulsar.client.util import to_base64_json
-from pulsar.daemon import (
+from pulsar.main import (
PULSAR_ROOT_DIR,
)
from pulsar.messaging import bind_amqp
diff --git a/pulsar/scripts/chown_working_directory.py b/pulsar/scripts/chown_working_directory.py
index 336fcaab..56f6bdc9 100644
--- a/pulsar/scripts/chown_working_directory.py
+++ b/pulsar/scripts/chown_working_directory.py
@@ -1,6 +1,6 @@
from os import system
from os.path import join, abspath
-from pulsar.daemon import ArgumentParser, PulsarConfigBuilder
+from pulsar.main import ArgumentParser, PulsarConfigBuilder
from pulsar.core import DEFAULT_STAGING_DIRECTORY
diff --git a/pulsar/scripts/drmaa_kill.py b/pulsar/scripts/drmaa_kill.py
index 44658d22..c21e6736 100644
--- a/pulsar/scripts/drmaa_kill.py
+++ b/pulsar/scripts/drmaa_kill.py
@@ -1,6 +1,6 @@
from json import load
from pulsar.managers.util.drmaa import DrmaaSessionFactory
-from pulsar.daemon import ArgumentParser
+from pulsar.main import ArgumentParser
DESCRIPTION = "Kill a job via DRMAA interface."
diff --git a/pulsar/scripts/drmaa_launch.py b/pulsar/scripts/drmaa_launch.py
index f5eef9e2..38345ee5 100644
--- a/pulsar/scripts/drmaa_launch.py
+++ b/pulsar/scripts/drmaa_launch.py
@@ -1,7 +1,7 @@
from __future__ import print_function
from json import load
from pulsar.managers.util.drmaa import DrmaaSessionFactory
-from pulsar.daemon import ArgumentParser
+from pulsar.main import ArgumentParser
DESCRIPTION = "Submit a DRMAA job."
diff --git a/pulsar/scripts/mesos_executor.py b/pulsar/scripts/mesos_executor.py
index 7848791f..4bb710b6 100644
--- a/pulsar/scripts/mesos_executor.py
+++ b/pulsar/scripts/mesos_executor.py
@@ -14,7 +14,7 @@ from pulsar.scripts.submit import (
)
from pulsar.manager_endpoint_util import submit_job
-from pulsar.daemon import (
+from pulsar.main import (
ArgumentParser,
PulsarManagerConfigBuilder,
)
diff --git a/pulsar/scripts/mesos_framework.py b/pulsar/scripts/mesos_framework.py
index e75da639..592b663d 100644
--- a/pulsar/scripts/mesos_framework.py
+++ b/pulsar/scripts/mesos_framework.py
@@ -3,7 +3,7 @@ from pulsar.mesos import (
)
from pulsar.mesos.framework import run
-from pulsar.daemon import (
+from pulsar.main import (
ArgumentParser,
PulsarManagerConfigBuilder,
)
diff --git a/pulsar/scripts/submit.py b/pulsar/scripts/submit.py
index 91d69619..449d90d2 100644
--- a/pulsar/scripts/submit.py
+++ b/pulsar/scripts/submit.py
@@ -1,9 +1,9 @@
import time
import json
-from pulsar.daemon import ArgumentParser
+from pulsar.main import ArgumentParser
from pulsar.client.util import from_base64_json
-from pulsar.daemon import (
+from pulsar.main import (
load_pulsar_app,
PulsarManagerConfigBuilder
)
diff --git a/pulsar/web/wsgi.py b/pulsar/web/wsgi.py
index 98e0de55..fe65d01b 100644
--- a/pulsar/web/wsgi.py
+++ b/pulsar/web/wsgi.py
@@ -1,7 +1,7 @@
import atexit
import inspect
-from pulsar.daemon import load_app_configuration
+from pulsar.main import load_app_configuration
from pulsar.core import PulsarApp
from pulsar.web.framework import RoutingApp
--
GitLab