GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-01-12 21:22:36 +01:00
Code Issues Projects Releases Wiki Activity

launcher: re-enable PID file checking by default

Browse Source
This commit is contained in:
James Lu 2017-07-20 21:19:00 +08:00
parent 819ac4d406
commit 1630d176d0
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
launcher.py
View File

@ -13,7 +13,6 @@ def main():
parser = argparse.ArgumentParser(description='Starts an instance of PyLink IRC Services.') parser = argparse.ArgumentParser(description='Starts an instance of PyLink IRC Services.')
parser.add_argument('config', help='specifies the path to the config file (defaults to pylink.yml)', nargs='?', default='pylink.yml') parser.add_argument('config', help='specifies the path to the config file (defaults to pylink.yml)', nargs='?', default='pylink.yml')
parser.add_argument("-v", "--version", help="displays the program version and exits", action='store_true') parser.add_argument("-v", "--version", help="displays the program version and exits", action='store_true')
parser.add_argument("-c", "--check-pid", help="enables PID file checking", action='store_true')
parser.add_argument("-n", "--no-pid", help="skips generating PID files", action='store_true') parser.add_argument("-n", "--no-pid", help="skips generating PID files", action='store_true')
args = parser.parse_args() args = parser.parse_args()
@ -36,9 +35,8 @@ def main():
elif os.name == 'posix': elif os.name == 'posix':
sys.stdout.write("\x1b]2;PyLink %s\x07" % __version__) sys.stdout.write("\x1b]2;PyLink %s\x07" % __version__)
# Check for a pid file. This stops instance overlap and user mistakes, which are especially an # Write and check for an existing PID file unless specifically told not to.
# issue for clientbot... if not args.no_pid:
if args.check_pid:
config = conf.confname config = conf.confname
if os.path.exists("%s.pid" % config): if os.path.exists("%s.pid" % config):
log.error("PID file exists; aborting! If PyLink didn't shut down cleanly last time it " log.error("PID file exists; aborting! If PyLink didn't shut down cleanly last time it "
@ -46,8 +44,6 @@ def main():
"again." % config) "again." % config)
sys.exit(1) sys.exit(1)
# Write a PID file unless specifically told not to.
if not args.no_pid:
with open('%s.pid' % conf.confname, 'w') as f: with open('%s.pid' % conf.confname, 'w') as f:
f.write(str(os.getpid())) f.write(str(os.getpid()))
world._should_remove_pid = True world._should_remove_pid = True