dxs
/
onionr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed merge issues

master
Kevin Froman 2018-05-04 12:44:35 -05:00
parent 56ca0abc63
commit ccea91e260
No known key found for this signature in database
GPG Key ID: 0D414D0FE405B63B
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
onionr/communicator.py
View File

@ -196,7 +196,7 @@ class OnionrCommunicate:
return self.connection_handlers return self.connection_handlers
elif name in self.connection_handlers: elif name in self.connection_handlers:
return self.connection_handlers[name] return self.connection_handlers[name]
else else:
return list() return list()
def add_connection_handler(self, name, handler): def add_connection_handler(self, name, handler):

6
onionr/onionr.py
View File

@ -25,7 +25,7 @@ import sys
if sys.version_info[0] == 2 or sys.version_info[1] < 5: if sys.version_info[0] == 2 or sys.version_info[1] < 5:
print('Error, Onionr requires Python 3.4+') print('Error, Onionr requires Python 3.4+')
sys.exit(1) sys.exit(1)
import os, base64, random, getpass, shutil, subprocess, requests, time, platform, datetime, re import os, base64, random, getpass, shutil, subprocess, requests, time, platform, datetime, re, json
from threading import Thread from threading import Thread
import api, core, config, logger, onionrplugins as plugins, onionrevents as events import api, core, config, logger, onionrplugins as plugins, onionrevents as events
from onionrutils import OnionrUtils from onionrutils import OnionrUtils
@ -64,7 +64,7 @@ class Onionr:
else: else:
# the default config file doesn't exist, try hardcoded config # the default config file doesn't exist, try hardcoded config
config.set_config({'devmode': True, 'log': {'file': {'output': True, 'path': 'data/output.log'}, 'console': {'output': True, 'color': True}}}) config.set_config({'devmode': True, 'log': {'file': {'output': True, 'path': 'data/output.log'}, 'console': {'output': True, 'color': True}}})
if not exists: if not data_exists:
config.save() config.save()
config.reload() # this will read the configuration file into memory config.reload() # this will read the configuration file into memory
@ -134,7 +134,7 @@ class Onionr:
# Get configuration # Get configuration
if not exists: if not data_exists:
# Generate default config # Generate default config
# Hostname should only be set if different from 127.x.x.x. Important for DNS rebinding attack prevention. # Hostname should only be set if different from 127.x.x.x. Important for DNS rebinding attack prevention.
if self.debug: if self.debug: