linse/servicemanager
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

put home in sys.path

Browse Source
This commit is contained in:
zolliker 2021-04-28 12:28:45 +02:00
parent 6a34bd164b
commit 5a1bdbf9a2
6 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
__init__.py
View File

@ -68,7 +68,6 @@ def run(group, arglist):
args['ins'] = arg args['ins'] = arg
else: else:
extra.append(arg) extra.append(arg)
print(args, extra)
try: try:
serv.action(args['action'], *serv.treat_args(args, extra)) serv.action(args['action'], *serv.treat_args(args, extra))
except AttributeError: except AttributeError:

1
base.py
View File

@ -308,7 +308,6 @@ class ServiceManager:
os.chdir(start_dir) os.chdir(start_dir)
if start_dir not in sys.path: if start_dir not in sys.path:
sys.path.insert(0, start_dir) sys.path.insert(0, start_dir)
print('SYSPATH', sys.path)
if wait: if wait:
proc = subprocess.Popen(cmd.split(), env=env) proc = subprocess.Popen(cmd.split(), env=env)
proc.wait() proc.wait()

3
bin/frappy
View File

@ -22,7 +22,8 @@
# ***************************************************************************** # *****************************************************************************
import sys import sys
from os.path import join, abspath, dirname from os.path import expanduser
sys.path.append(expanduser('~'))
from servicemanager import run from servicemanager import run
run('frappy', sys.argv[1:]) run('frappy', sys.argv[1:])

3
bin/sea
View File

@ -22,7 +22,8 @@
# ***************************************************************************** # *****************************************************************************
import sys import sys
from os.path import join, abspath, dirname from os.path import expanduser
sys.path.append(expanduser('~'))
from servicemanager import run from servicemanager import run
run('sea', sys.argv[1:]) run('sea', sys.argv[1:])

3
bin/seweb
View File

@ -22,7 +22,8 @@
# ***************************************************************************** # *****************************************************************************
import sys import sys
from os.path import join, abspath, dirname from os.path import expanduser
sys.path.append(expanduser('~'))
from servicemanager import run from servicemanager import run
run('seweb', sys.argv[1:]) run('seweb', sys.argv[1:])

3
frappyman.py
View File

@ -59,8 +59,6 @@ class FrappyManager(ServiceManager):
def prepare_start(self, ins, service, cfg=''): def prepare_start(self, ins, service, cfg=''):
import os import os
import sys import sys
print('CWD', os.getcwd())
print('PYTHONPATH', sys.path)
start_dir, env = super().prepare_start(ins, service) start_dir, env = super().prepare_start(ins, service)
his = env.get('FRAPPY_HISTORY') his = env.get('FRAPPY_HISTORY')
@ -69,7 +67,6 @@ class FrappyManager(ServiceManager):
cfgpaths = self.config_dirs(ins, service) cfgpaths = self.config_dirs(ins, service)
if cfgpaths: if cfgpaths:
env['SECOP_CONFDIR'] = os.pathsep.join(cfgpaths) env['SECOP_CONFDIR'] = os.pathsep.join(cfgpaths)
print(env['SECOP_CONFDIR'])
return start_dir, env return start_dir, env
def do_start(self, ins, service=None, cfg='', restart=False, wait=False, logger=None): def do_start(self, ins, service=None, cfg='', restart=False, wait=False, logger=None):