GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-01 01:09:22 +01:00
Code Issues Projects Releases Wiki Activity

Rework the launcher to always call the installed copy of PyLink

Browse Source 
This should prevent cryptic errors caused by mismatched PyLink core/launcher versions.
This commit is contained in:
James Lu 2017-07-20 21:01:16 +08:00
parent 63f52ca8b0
commit 2113f834a3
3 changed files with 102 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
launcher.py Normal file
View File

@ -0,0 +1,89 @@
#!/usr/bin/env python3
"""
PyLink IRC Services launcher.
"""
import os
import sys
from pylinkirc import world, conf, __version__, real_version
def main():
import argparse
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("-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')
args = parser.parse_args()
if args.version: # Display version and exit
print('PyLink %s (in VCS: %s)' % (__version__, real_version))
sys.exit()
# FIXME: we can't pass logging on to conf until we set up the config...
conf.loadConf(args.config)
from pylinkirc.log import log
from pylinkirc import classes, utils, coremods
log.info('PyLink %s starting...', __version__)
# Set terminal window title. See https://bbs.archlinux.org/viewtopic.php?id=85567
# and https://stackoverflow.com/questions/7387276/
if os.name == 'nt':
import ctypes
ctypes.windll.kernel32.SetConsoleTitleW("PyLink %s" % __version__)
elif os.name == 'posix':
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
# issue for clientbot...
if args.check_pid:
config = conf.confname
if os.path.exists("%s.pid" % config):
log.error("PID file exists; aborting! If PyLink didn't shut down cleanly last time it "
"was run, or you're upgrading from PyLink < 1.1-dev, delete %s.pid and try "
"again." % config)
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:
f.write(str(os.getpid()))
# Import plugins first globally, because they can listen for events
# that happen before the connection phase.
to_load = conf.conf['plugins']
utils.resetModuleDirs()
# Here, we override the module lookup and import the plugins
# dynamically depending on which were configured.
for plugin in to_load:
try:
world.plugins[plugin] = pl = utils.loadPlugin(plugin)
except Exception as e:
log.exception('Failed to load plugin %r: %s: %s', plugin, type(e).__name__, str(e))
else:
if hasattr(pl, 'main'):
log.debug('Calling main() function of plugin %r', pl)
pl.main()
# Initialize all the networks one by one
for network, sdata in conf.conf['servers'].items():
try:
protoname = sdata['protocol']
except (KeyError, TypeError):
log.error("(%s) Configuration error: No protocol module specified, aborting.", network)
else:
# Fetch the correct protocol module.
proto = utils.getProtocolModule(protoname)
# Create and connect the network.
world.networkobjects[network] = irc = proto.Class(network)
log.debug('Connecting to network %r', network)
irc.connect()
world.started.set()
log.info("Loaded plugins: %s", ', '.join(sorted(world.plugins.keys())))
coremods.permissions.resetPermissions() # XXX we should probably move this to run on import

101
pylink
View File

@ -1,98 +1,13 @@
#!/usr/bin/env python3
"""
PyLink IRC Services launcher.
"""
import os
import sys
try:
from pylinkirc import world
from pylinkirc import launcher
except ImportError:
sys.stderr.write("ERROR: Failed to import PyLink main module (pylinkirc.world).\n\nIf you are "
"running PyLink from source, please install PyLink first using 'python3 "
"setup.py install' (global install) or 'python3 setup.py install --user'"
" (local install)\n")
print("ERROR: Failed to import PyLink launcher module (pylinkirc.launcher).\n\nIf you are "
"running PyLink from source, please install PyLink first using 'python3 "
"setup.py install' (global install) or 'python3 setup.py install --user'"
" (local install)\n")
sys.exit(1)
from pylinkirc import conf, __version__, real_version
if __name__ == '__main__':
import argparse
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("-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')
args = parser.parse_args()
if args.version: # Display version and exit
print('PyLink %s (in VCS: %s)' % (__version__, real_version))
sys.exit()
# FIXME: we can't pass logging on to conf until we set up the config...
conf.loadConf(args.config)
from pylinkirc.log import log
from pylinkirc import classes, utils, coremods
log.info('PyLink %s starting...', __version__)
# Set terminal window title. See https://bbs.archlinux.org/viewtopic.php?id=85567
# and https://stackoverflow.com/questions/7387276/
if os.name == 'nt':
import ctypes
ctypes.windll.kernel32.SetConsoleTitleW("PyLink %s" % __version__)
elif os.name == 'posix':
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
# issue for clientbot...
if args.check_pid:
config = conf.confname
if os.path.exists("%s.pid" % config):
log.error("PID file exists; aborting! If PyLink didn't shut down cleanly last time it "
"was run, or you're upgrading from PyLink < 1.1-dev, delete %s.pid and try "
"again." % config)
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:
f.write(str(os.getpid()))
# Import plugins first globally, because they can listen for events
# that happen before the connection phase.
to_load = conf.conf['plugins']
utils.resetModuleDirs()
# Here, we override the module lookup and import the plugins
# dynamically depending on which were configured.
for plugin in to_load:
try:
world.plugins[plugin] = pl = utils.loadPlugin(plugin)
except Exception as e:
log.exception('Failed to load plugin %r: %s: %s', plugin, type(e).__name__, str(e))
else:
if hasattr(pl, 'main'):
log.debug('Calling main() function of plugin %r', pl)
pl.main()
# Initialize all the networks one by one
for network, sdata in conf.conf['servers'].items():
try:
protoname = sdata['protocol']
except (KeyError, TypeError):
log.error("(%s) Configuration error: No protocol module specified, aborting.", network)
else:
# Fetch the correct protocol module.
proto = utils.getProtocolModule(protoname)
# Create and connect the network.
world.networkobjects[network] = irc = proto.Class(network)
log.debug('Connecting to network %r', network)
irc.connect()
world.started.set()
log.info("Loaded plugins: %s", ', '.join(sorted(world.plugins.keys())))
from pylinkirc import coremods
coremods.permissions.resetPermissions() # XXX we should probably move this to run on import
else:
if __name__ == '__main__':
launcher.main()

6
setup.py
View File

@ -97,5 +97,9 @@ setup(
package_dir = {'pylinkirc': '.'},
# Executable scripts
scripts=["pylink", "pylink-mkpasswd"],
scripts=["pylink-mkpasswd"],
entry_points = {
'console_scripts': ['pylink=pylinkirc.launcher:main'],
}
)