catdog2/urlbot-native
1
0
Fork 0
Code Issues Pull Requests Releases Activity

scope fixes; moved VERSION to conf()

Browse Source
This commit is contained in:
urlbot
2014-09-27 06:12:34 +02:00
parent 7c9e5e154b
commit f411e1be4d
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
local_config.py.skel
View File

@@ -18,6 +18,8 @@ config['hist_max_time'] = 10 * 60
config['uptime'] = -time.time() config['uptime'] = -time.time()
config['request_counter'] = 0 config['request_counter'] = 0
config['version'] = None
# the "dice" feature will use more efficient random data (0) for given users # the "dice" feature will use more efficient random data (0) for given users
config['enhanced-random-user'] = ( 'FIXME', 'FIXME' ) config['enhanced-random-user'] = ( 'FIXME', 'FIXME' )

2
plugins.py
View File

@@ -110,7 +110,7 @@ def command_version(args):
if 'version' in args['data']: if 'version' in args['data']:
return { return {
'msg': args['reply_user'] + (''': I'm running ''' + VERSION) 'msg': args['reply_user'] + (''': I'm running ''' + conf('version'))
} }
def command_unicode(args): def command_unicode(args):

4
urlbot.py
View File

@@ -244,8 +244,8 @@ plugins.time = time
plugins.register_all() plugins.register_all()
if '__main__' == __name__: if '__main__' == __name__:
VERSION = get_version_git() set_conf('version', get_version_git())
print sys.argv[0] + ' ' + VERSION print sys.argv[0] + ' ' + conf('version')
if not os.path.exists(fifo_path): if not os.path.exists(fifo_path):
logger('error', 'fifo_path "%s" does not exist, exiting' % fifo_path) logger('error', 'fifo_path "%s" does not exist, exiting' % fifo_path)