updated docstring

exclude_badExits.py

@@ -106,13 +106,6 @@ try:
 except:
     ub_ctx = RR_TYPE_TXT = RR_CLASS_IN = None
 
-try:
-    if 'COLOREDLOGS_LEVEL_STYLES' not in os.environ:
-        os.environ['COLOREDLOGS_LEVEL_STYLES'] = 'spam=22;debug=28;verbose=34;notice=220;warning=202;success=118,bold;error=124;critical=background=red'
-    # https://pypi.org/project/coloredlogs/
-    import coloredlogs
-except ImportError as e:
-    coloredlogs = False
 
 global LOG
 import logging
@@ -120,7 +113,7 @@ import warnings
 warnings.filterwarnings('ignore')
 LOG = logging.getLogger()
 
-import requests
+from support_phantompy import vsetup_logging
 from trustor_poc import oDownloadUrlUrllib3 as oDownloadUrl
 from trustor_poc import idns_validate, TrustorError
 from support_onions import icheck_torrc, bAreWeConnected, lIntroductionPoints, zResolveDomain, vwait_for_controller, yKNOWN_NODNS
@@ -383,67 +376,6 @@ def aParseContact(contact, fp):
     a = yaml.safe_load(oFd)
     return a
 
-def vsetup_logging(log_level, logfile=''):
-    global LOG
-    add = True
-
-    # stem fucks up logging
-    from stem.util import log
-    logging.getLogger('stem').setLevel(30)
-
-    logging._defaultFormatter = logging.Formatter(datefmt='%m-%d %H:%M:%S')
-    logging._defaultFormatter.default_time_format = '%m-%d %H:%M:%S'
-    logging._defaultFormatter.default_msec_format = ''
-
-    kwargs = dict(level=log_level,
-                  force=True,
-                  format='%(levelname)s %(message)s')
-
-    if logfile:
-        add = logfile.startswith('+')
-        sub = logfile.startswith('-')
-        if add or sub:
-            logfile = logfile[1:]
-        kwargs['filename'] = logfile
-
-    if coloredlogs:
-        # https://pypi.org/project/coloredlogs/
-        aKw = dict(level=log_level,
-                   logger=LOG,
-                   stream=sys.stdout if add else None,
-                   fmt='%(levelname)s %(message)s'
-                   )
-        coloredlogs.install(**aKw)
-        if logfile:
-            oHandler = logging.FileHandler(logfile)
-            LOG.addHandler(oHandler)
-        LOG.info(f"CSetting log_level to {log_level!s}")
-    else:
-        logging.basicConfig(**kwargs)
-        if add and logfile:
-            oHandler = logging.StreamHandler(sys.stdout)
-            LOG.addHandler(oHandler)
-        LOG.info(f"SSetting log_level to {log_level!s}")
-
-        logging._levelToName = {
-            logging.CRITICAL: 'CRITICAL',
-            logging.ERROR: 'ERROR',
-            logging.WARNING: 'WARN',
-            logging.INFO: 'INFO',
-            logging.DEBUG: 'DEBUG',
-            logging.NOTSET: 'NOTSET',
-        }
-        logging._nameToLevel = {
-            'CRITICAL': logging.CRITICAL,
-            'FATAL': logging.FATAL,
-            'ERROR': logging.ERROR,
-            'WARN': logging.WARNING,
-            'WARNING': logging.WARNING,
-            'INFO': logging.INFO,
-            'DEBUG': logging.DEBUG,
-            'NOTSET': logging.NOTSET,
-        }
-
 def oMainArgparser(_=None):
 
     try:
@@ -508,7 +440,8 @@ def oMainArgparser(_=None):
     parser.add_argument('--white_services', type=str,
                         default='',
                         help="comma sep. list of onions to whitelist their introduction points - BROKEN")
-    parser.add_argument('--torrc_output', type=str, default='',
+    parser.add_argument('--torrc_output', type=str,
+                        default=os.path.join(ETC_DIR, 'torrc.new'),
                         help="Write the torrc configuration to a file")
     parser.add_argument('--proof_output', type=str, default=os.path.join(ETC_DIR, 'proof.yaml'),
                         help="Write the proof data of the included nodes to a YAML file")