Moved start_proxyconfig to helper_startup;

no more prints in helper_startup

src/bitmessagemain.py

@@ -39,7 +39,8 @@ import shutdown
 from bmconfigparser import BMConfigParser
 from debug import logger  # this should go before any threads
 from helper_startup import (
-    isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections
+    isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections,
+    start_proxyconfig
 )
 from inventory import Inventory
 from knownnodes import readKnownNodes
@@ -168,30 +169,9 @@ def signal_handler(signum, frame):
 
 class Main(object):
     """Main PyBitmessage class"""
-    @staticmethod
-    def start_proxyconfig(config):
-        """Check socksproxytype and start any proxy configuration plugin"""
-        proxy_type = config.safeGet('bitmessagesettings', 'socksproxytype')
-        if proxy_type not in ('none', 'SOCKS4a', 'SOCKS5'):
-            # pylint: disable=relative-import
-            from plugins.plugin import get_plugin
-            try:
-                proxyconfig_start = time.time()
-                if not get_plugin('proxyconfig', name=proxy_type)(config):
-                    raise TypeError
-            except TypeError:
-                logger.error(
-                    'Failed to run proxy config plugin %s',
-                    proxy_type, exc_info=True)
-                shutdown.doCleanShutdown()
-                sys.exit(2)
-            else:
-                logger.info(
-                    'Started proxy config plugin %s in %s sec',
-                    proxy_type, time.time() - proxyconfig_start)
-
-    def start(self):    # pylint: disable=too-many-statements, too-many-branches, too-many-locals
+    def start(self):
         """Start main application"""
+        # pylint: disable=too-many-statements,too-many-branches,too-many-locals
         _fixSocket()
 
         config = BMConfigParser()
@@ -350,7 +330,7 @@ class Main(object):
 
         # start network components if networking is enabled
         if state.enableNetwork:
-            self.start_proxyconfig(config)
+            start_proxyconfig()
             BMConnectionPool()
             asyncoreThread = BMNetworkThread()
             asyncoreThread.daemon = True
@@ -410,7 +390,7 @@ class Main(object):
                     self.stop()
         elif not state.enableGUI:
             from tests import core as test_core  # pylint: disable=relative-import
-            test_core_result = test_core.run(self)
+            test_core_result = test_core.run()
             state.enableGUI = True
             self.stop()
             test_core.cleanup()

src/helper_startup.py

@@ -2,11 +2,12 @@
 Startup operations.
 """
 # pylint: disable=too-many-branches,too-many-statements
-from __future__ import print_function
 
+import logging
 import os
 import platform
 import sys
+import time
 from distutils.version import StrictVersion
 
 import defaults
@@ -15,6 +16,13 @@ import paths
 import state
 from bmconfigparser import BMConfigParser
 
+try:
+    from plugins.plugin import get_plugin
+except ImportError:
+    get_plugin = None
+
+
+logger = logging.getLogger('default')
 
 # The user may de-select Portable Mode in the settings if they want
 # the config files to stay in the application data folder.
@@ -30,14 +38,14 @@ def loadConfig():
         needToCreateKeysFile = config.safeGet(
             'bitmessagesettings', 'settingsversion') is None
         if not needToCreateKeysFile:
-            print(
+            logger.info(
                 'Loading config files from directory specified'
-                ' on startup: %s' % state.appdata)
+                ' on startup: %s', state.appdata)
     else:
         config.read(paths.lookupExeFolder() + 'keys.dat')
         try:
             config.get('bitmessagesettings', 'settingsversion')
-            print('Loading config files from same directory as program.')
+            logger.info('Loading config files from same directory as program.')
             needToCreateKeysFile = False
             state.appdata = paths.lookupExeFolder()
         except:
@@ -48,7 +56,8 @@ def loadConfig():
             needToCreateKeysFile = config.safeGet(
                 'bitmessagesettings', 'settingsversion') is None
             if not needToCreateKeysFile:
-                print('Loading existing config files from', state.appdata)
+                logger.info(
+                    'Loading existing config files from %s', state.appdata)
 
     if needToCreateKeysFile:
 
@@ -103,9 +112,10 @@ def loadConfig():
             # Just use the same directory as the program and forget about
             # the appdata folder
             state.appdata = ''
-            print('Creating new config files in same directory as program.')
+            logger.info(
+                'Creating new config files in same directory as program.')
         else:
-            print('Creating new config files in', state.appdata)
+            logger.info('Creating new config files in %s', state.appdata)
             if not os.path.exists(state.appdata):
                 os.makedirs(state.appdata)
         if not sys.platform.startswith('win'):
@@ -255,7 +265,7 @@ def updateConfig():
             'bitmessagesettings', 'hidetrayconnectionnotifications', 'false')
     if config.safeGetInt('bitmessagesettings', 'maxoutboundconnections') < 1:
         config.set('bitmessagesettings', 'maxoutboundconnections', '8')
-        print('WARNING: your maximum outbound connections must be a number.')
+        logger.warning('Your maximum outbound connections must be a number.')
 
     # TTL is now user-specifiable. Let's add an option to save
     # whatever the user selects.
@@ -278,3 +288,26 @@ def isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections():
         return False
     except Exception:
         pass
+
+
+def start_proxyconfig():
+    """Check socksproxytype and start any proxy configuration plugin"""
+    if not get_plugin:
+        return
+    config = BMConfigParser()
+    proxy_type = config.safeGet('bitmessagesettings', 'socksproxytype')
+    if proxy_type and proxy_type not in ('none', 'SOCKS4a', 'SOCKS5'):
+        try:
+            proxyconfig_start = time.time()
+            if not get_plugin('proxyconfig', name=proxy_type)(config):
+                raise TypeError()
+        except TypeError:
+            # cannot import shutdown here ):
+            logger.error(
+                'Failed to run proxy config plugin %s',
+                proxy_type, exc_info=True)
+            os._exit(0)  # pylint: disable=protected-access
+        else:
+            logger.info(
+                'Started proxy config plugin %s in %s sec',
+                proxy_type, time.time() - proxyconfig_start)

src/tests/core.py

@@ -14,6 +14,7 @@ import unittest
 import knownnodes
 import state
 from bmconfigparser import BMConfigParser
+from helper_startup import start_proxyconfig
 from helper_msgcoding import MsgEncode, MsgDecode
 from network import asyncore_pollchoose as asyncore
 from network.connectionpool import BMConnectionPool
@@ -21,8 +22,8 @@ from network.node import Peer
 from network.tcp import Socks4aBMConnection, Socks5BMConnection, TCPConnection
 from queues import excQueue
 
+
 knownnodes_file = os.path.join(state.appdata, 'knownnodes.dat')
-program = None
 
 
 def pickle_knownnodes():
@@ -196,14 +197,12 @@ class TestCore(unittest.TestCase):
         self._check_bootstrap()
         self._initiate_bootstrap()
         BMConfigParser().set('bitmessagesettings', 'socksproxytype', 'stem')
-        program.start_proxyconfig(BMConfigParser())
+        start_proxyconfig()
         self._check_bootstrap()
 
 
-def run(prog):
+def run():
     """Starts all tests defined in this module"""
-    global program  # pylint: disable=global-statement
-    program = prog
     loader = unittest.TestLoader()
     loader.sortTestMethodsUsing = None
     suite = loader.loadTestsFromTestCase(TestCore)