From edcafa727558f9ce48d1b59c8405733931077b2b Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 1 Jan 2018 20:54:48 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=20beat=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 run_server.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/run_server.py b/run_server.py
index ec0a73a89..47f3951e7 100644
--- a/run_server.py
+++ b/run_server.py
@@ -87,7 +87,33 @@ def start_beat():
     os.environ.setdefault('C_FORCE_ROOT', '1')
     pidfile = '/tmp/beat.pid '
     if os.path.exists(pidfile):
+        print("Pid file `{}` exist, remove it".format(pidfile))
         os.unlink(pidfile)
+        time.sleep(1)
+
+    if os.path.exists(pidfile):
+        print("Pid file `{}` exist yet, may be something wrong".format(pidfile))
+        os.unlink(pidfile)
+
+    scheduler = "django_celery_beat.schedulers:DatabaseScheduler"
+    options = "--pidfile {}  -l {} --scheduler {} --max-interval 60".format(
+        pidfile, LOG_LEVEL, scheduler,
+    )
+    cmd = 'celery -A common beat {} '.format(options)
+    p = subprocess.Popen(cmd, shell=True, stdout=sys.stdout, stderr=sys.stderr)
+    return p
+
+
+def start_service(services):
+    print(time.ctime())
+    print('Jumpserver version {}, more see https://www.jumpserver.org'.format(
+        __version__))
+    print('Quit the server with CONTROL-C.')
+
+    services_all = {
+        "gunicorn": start_gunicorn,
+        "celery": start_celery,
+
     scheduler = "django_celery_beat.schedulers:DatabaseScheduler"
     options = "--pidfile {}  -l {} --scheduler {} --max-interval 60".format(
         pidfile, LOG_LEVEL, scheduler,