Philipp Hörist pushed to branch master at gajim / gajim

Commits:

1 changed file:

Changes:

  • gajim/common/logging_helpers.py
    ... ... @@ -174,8 +174,7 @@ def init() -> None:
    174 174
         if os.name != 'nt':
    
    175 175
             use_color = sys.stderr.isatty()
    
    176 176
     
    
    177
    -    consoleloghandler = CustomStreamHandler()
    
    178
    -    consoleloghandler.setFormatter(
    
    177
    +    _custom_stream_handler.setFormatter(
    
    179 178
             FancyFormatter(
    
    180 179
                 '%(asctime)s %(levelname)s %(name)-35s %(message)s',
    
    181 180
                 '%x %H:%M:%S',
    
    ... ... @@ -185,22 +184,22 @@ def init() -> None:
    185 184
     
    
    186 185
         root_log = logging.getLogger('gajim')
    
    187 186
         root_log.setLevel(logging.WARNING)
    
    188
    -    root_log.addHandler(consoleloghandler)
    
    187
    +    root_log.addHandler(_custom_stream_handler)
    
    189 188
         root_log.propagate = False
    
    190 189
     
    
    191 190
         root_log = logging.getLogger('nbxmpp')
    
    192 191
         root_log.setLevel(logging.ERROR)
    
    193
    -    root_log.addHandler(consoleloghandler)
    
    192
    +    root_log.addHandler(_custom_stream_handler)
    
    194 193
         root_log.propagate = False
    
    195 194
     
    
    196 195
         root_log = logging.getLogger('gnupg')
    
    197 196
         root_log.setLevel(logging.WARNING)
    
    198
    -    root_log.addHandler(consoleloghandler)
    
    197
    +    root_log.addHandler(_custom_stream_handler)
    
    199 198
         root_log.propagate = False
    
    200 199
     
    
    201 200
         root_log = logging.getLogger('omemo_dr')
    
    202 201
         root_log.setLevel(logging.WARNING)
    
    203
    -    root_log.addHandler(consoleloghandler)
    
    202
    +    root_log.addHandler(_custom_stream_handler)
    
    204 203
         root_log.propagate = False
    
    205 204
     
    
    206 205
         # GAJIM_DEBUG is set only on Windows when using Gajim-Debug.exe
    
    ... ... @@ -226,6 +225,10 @@ def set_quiet() -> None:
    226 225
         parseAndSetLogLevels('.omemo_dr=CRITICAL')
    
    227 226
     
    
    228 227
     
    
    228
    +def get_stream_handler() -> CustomStreamHandler:
    
    229
    +    return _custom_stream_handler
    
    230
    +
    
    231
    +
    
    229 232
     def _redirect_output() -> None:
    
    230 233
         debug_folder = configpaths.get('DEBUG')
    
    231 234
         date = datetime.today().strftime('%d%m%Y-%H%M%S')
    
    ... ... @@ -244,6 +247,9 @@ def _cleanup_debug_logs() -> None:
    244 247
                 file.unlink()
    
    245 248
     
    
    246 249
     
    
    250
    +_custom_stream_handler = CustomStreamHandler()
    
    251
    +
    
    252
    +
    
    247 253
     if __name__ == '__main__':
    
    248 254
         init()
    
    249 255