added separate admin log file

Author: vesellov

bitdust/customer/fire_hire.py

@@ -724,6 +724,7 @@ def doSubstituteSupplier(self, *args, **kwargs):
                 ecc_map=eccmap.Current().name,
                 family_snapshot=id_url.to_bin_list(contactsdb.suppliers()),
             ))
+            lg.admin('added new supplier %r, family position is unknown' % new_idurl)
             # yapf: enable
         else:
             if old_idurl:
@@ -736,6 +737,7 @@ def doSubstituteSupplier(self, *args, **kwargs):
                     ecc_map=eccmap.Current().name,
                     family_snapshot=id_url.to_bin_list(contactsdb.suppliers()),
                 ))
+                lg.admin('hired new supplier %r and substitute existing supplier %r at position %d' % (new_idurl, old_idurl, family_position))
                 # yapf: enable
             else:
                 lg.info('hired new supplier on empty position %d : %s desired_suppliers=%d current_suppliers=%d' % (family_position, new_idurl, desired_suppliers, len(contactsdb.suppliers())))
@@ -747,6 +749,7 @@ def doSubstituteSupplier(self, *args, **kwargs):
                     ecc_map=eccmap.Current().name,
                     family_snapshot=id_url.to_bin_list(contactsdb.suppliers()),
                 ))
+                lg.admin('hired new supplier %r on empty position %d' % (new_idurl, family_position))
                 # yapf: enable
         self.restart_interval = 1.0
         if _Debug:
@@ -786,6 +789,7 @@ def doRemoveSuppliers(self, *args, **kwargs):
                 old_idurl=supplier_idurl,
                 position=position,
             ))
+            lg.admin('removed supplier %r at position %r' % (supplier_idurl, position))
         lg.info('removed some suppliers : %d  desired_suppliers=%d current_suppliers=%d' % (len(self.dismiss_list), desired_suppliers, len(contactsdb.suppliers())))
         if _Debug:
             lg.out(_DebugLevel, '    my current suppliers: %r' % contactsdb.suppliers())

bitdust/interface/api.py

@@ -5217,10 +5217,11 @@ def customer_reject(customer_id: str, erase_customer_key: bool = True):
     """
     if not driver.is_on('service_supplier'):
         return ERROR('service_supplier() is not started')
-    from bitdust.contacts import contactsdb
-    from bitdust.storage import accounting
     from bitdust.main import settings
     from bitdust.main import events
+    from bitdust.logs import lg
+    from bitdust.contacts import contactsdb
+    from bitdust.storage import accounting
     from bitdust.supplier import local_tester
     from bitdust.raid import eccmap
     from bitdust.p2p import p2p_service
@@ -5249,6 +5250,7 @@ def customer_reject(customer_id: str, erase_customer_key: bool = True):
     accounting.write_customers_quotas(space_dict, new_free_space)
     contactsdb.update_customers(current_customers)
     contactsdb.save_customers()
+    lg.admin('customer %r was rejected' % customer_idurl)
     if erase_customer_key:
         # erase customer key
         customer_key_id = my_keys.make_key_id(alias='customer', creator_idurl=customer_idurl)

bitdust/interface/web_html_template.py

@@ -66,7 +66,7 @@
                     </a>
                     <ul class="dropdown-menu">
                         <li class="dropdown-item" style="color:#8089ff;background-color:white;">
-                            <a href="https://bitdust.io/#" data-scrollto="ecosystem" data-content="menu_Ecosystem" style="color:#8089ff;background-color:white;">BitDust roles</a>
+                            <a href="https://bitdust.io/#ecosystem" data-scrollto="ecosystem" data-content="menu_Ecosystem" style="color:#8089ff;background-color:white;">BitDust roles</a>
                         </li>
                         <li class="dropdown-item">
                             <a href="https://identities.bitdust.io/" style="color:#8089ff;">ID servers</a>

bitdust/interface/web_socket_transmitter.py

@@ -190,6 +190,7 @@ def add_route():
         'external_bytes': 0,
         'external_updated': None,
     }
+    lg.admin('added new route %r route_url=%r internal_url=%r' % (route_id, route_url, internal_url))
     if _Debug:
         lg.args(_DebugLevel, route_id=route_id, routes=len(_Routes))
     return route_id
@@ -241,21 +242,21 @@ def cleanup_routes(save=False):
     for route_id in _Routes.keys():
         route_info = _Routes[route_id]
         internal_updated = route_info.get('internal_updated') or 0
-        internal_expired = True if internal_updated and utime.get_sec1970() - internal_updated > 60*60*24*30 else False
+        internal_expired = True if (internal_updated and (utime.get_sec1970() - internal_updated > 60*60*24*90)) else False
         external_updated = route_info.get('external_updated') or 0
-        external_expired = True if external_updated and utime.get_sec1970() - external_updated > 60*60*24*30 else False
+        external_expired = True if (external_updated and (utime.get_sec1970() - external_updated > 60*60*24*90)) else False
         if internal_expired and external_expired:
             routes_to_be_removed.append(route_id)
         else:
             create_expired = False
             if not internal_updated and not external_updated:
-                create_expired = utime.get_sec1970() - (route_info.get('created') or 0) > 60*60*24
+                create_expired = utime.get_sec1970() - (route_info.get('created') or 0) > 60*60*24*180
             if create_expired:
                 routes_to_be_removed.append(route_id)
     cleaned_something = False
     for route_id in routes_to_be_removed:
         if route_id in _Routes:
-            lg.info('about to remove inactive route %r' % route_id)
+            lg.admin('removing inactive route %r : %r' % (route_id, route_info))
             _Routes.pop(route_id)
             cleaned_something = True
     if cleaned_something and save:
@@ -383,9 +384,9 @@ class WebSocketFactory(Factory):
 
     protocol = WebSocketProtocol
 
-    def buildProtocol(self, addr):
-        proto = Factory.buildProtocol(self, addr)
-        return proto
+    # def buildProtocol(self, addr):
+    #     proto = Factory.buildProtocol(self, addr)
+    #     return proto
 
 
 #------------------------------------------------------------------------------

bitdust/logs/lg.py

@@ -230,10 +230,7 @@ def args(_DebugLevel, *args, **kwargs):
     for k in kwargs:
         funcargs.append('%s=%r' % (k, kwargs.get(k)))
     funcname = '%s.%s' % (modul, caller)
-    o = '%s(%s)' % (
-        funcname,
-        ', '.join(funcargs),
-    )
+    o = '%s(%s)' % (funcname, ', '.join(funcargs))
     if message:
         o += ' ' + message
     out(level, o, showtime=True, log_name=log_name)
@@ -247,19 +244,10 @@ def info(message, level=2, log_name='stdout'):
     cod = sys._getframe().f_back.f_code
     modul = os.path.basename(cod.co_filename).replace('.py', '')
     caller = cod.co_name
-    output_string = 'INFO %s in %s.%s()' % (
-        message,
-        modul,
-        caller,
-    )
+    output_string = 'INFO %s.%s() %s' % (modul, caller, message)
     if _UseColors:
-        output_string = '\033[0;49;92mINFO %s \033[0m\033[0;49;37min %s.%s()\033[0m' % (
-            message,
-            modul,
-            caller,
-        )
+        output_string = '\033[0;49;92mINFO\033[0m \033[0;49;37m%s.%s()\033[0m \033[0;49;92m%s\033[0m' % (modul, caller, message)
     out(level, output_string, showtime=True, log_name=log_name)
-    # out(level, output_string, log_name='info', showtime=True)
     return message
 
 
@@ -270,19 +258,10 @@ def warn(message, level=2, log_name='stdout'):
     cod = sys._getframe().f_back.f_code
     modul = os.path.basename(cod.co_filename).replace('.py', '')
     caller = cod.co_name
-    output_string = 'WARNING %s in %s.%s()' % (
-        message,
-        modul,
-        caller,
-    )
+    output_string = 'WARNING %s.%s() %s' % (modul, caller, message)
     if _UseColors:
-        output_string = '\033[0;35mWARNING %s \033[0m\033[0;49;37min %s.%s()\033[0m' % (
-            message,
-            modul,
-            caller,
-        )
+        output_string = '\033[0;35mWARNING\033[0m \033[0;49;37m%s.%s()\033[0m \033[0;35m%s\033[0m' % (modul, caller, message)
     out(level, output_string, showtime=True, log_name=log_name)
-    # out(level, output_string, log_name='warn', showtime=True)
     return message
 
 
@@ -299,14 +278,13 @@ def err(message, level=0, log_name='stdout'):
     if not isinstance(message, six.text_type):  # @UndefinedVariable
         message = str(message)
     if not message.count(funcname):
-        message = ' %s in %s()' % (message, funcname)
+        message = '%s() : %s' % (funcname, message)
     if not message.count('ERROR'):
         message = 'ERROR ' + message
     message = '%s%s   ' % ((' '*(level + 11)), message)
     if _UseColors:
         message = '\033[1;37;41m%s\033[0m' % message
     out(level, message, showtime=True, log_name=log_name)
-    # out(level, message, log_name='err', showtime=True)
     return message
 
 
@@ -326,11 +304,7 @@ def cb(result, *args, **kwargs):
     _method = kwargs.pop('method', 'unknown')
     _log_name = kwargs.pop('log_name', 'stdout')
     if _debug and is_debug(_debug_level):
-        dbg(_debug_level, 'Deferred.callback() from "%s" method : args=%r  kwargs=%r' % (
-            _method,
-            args,
-            kwargs,
-        ), log_name=_log_name)
+        dbg(_debug_level, 'Deferred.callback() from "%s" method : args=%r  kwargs=%r' % (_method, args, kwargs), log_name=_log_name)
     return result
 
 
@@ -341,12 +315,7 @@ def errback(err, *args, **kwargs):
     _ignore = kwargs.pop('ignore', False)
     _log_name = kwargs.pop('log_name', 'stdout')
     if _debug and is_debug(_debug_level):
-        dbg(_debug_level, 'Deferred.errback() from "%s" method with %r : args=%r  kwargs=%r' % (
-            _method,
-            repr(err).replace('\n', ''),
-            args,
-            kwargs,
-        ), log_name=_log_name)
+        dbg(_debug_level, 'Deferred.errback() from "%s" method with %r : args=%r  kwargs=%r' % (_method, repr(err).replace('\n', ''), args, kwargs), log_name=_log_name)
     if _ignore:
         return None
     return err
@@ -432,6 +401,15 @@ def exception(level, maxTBlevel, exc_info, message=None, log_name='stdout'):
     return s
 
 
+def admin(message, log_name='admin'):
+    cod = sys._getframe().f_back.f_code
+    modul = os.path.basename(cod.co_filename).replace('.py', '')
+    caller = cod.co_name
+    output_string = '%s.%s() %s' % (modul, caller, message)
+    out(0, output_string, showtime=True, log_name=log_name)
+    return message
+
+
 def format_exception(maxTBlevel=100, exc_info=None):
     """
     Return string with detailed info about last exception.
@@ -447,7 +425,7 @@ def format_exception(maxTBlevel=100, exc_info=None):
     excTb = traceback.format_tb(trbk, maxTBlevel)
     tbstring = 'Exception: <' + exception_name(value, exc_type, excTb) + '>\n'
     if excArgs:
-        tbstring += '  args:' + excArgs + '\n'
+        tbstring += ' args:' + excArgs + '\n'
     for s in excTb:
         tbstring += s + '\n'
     return tbstring

bitdust/main/config_defaults.py

@@ -76,10 +76,6 @@ def reset(conf_obj):
 
     conf_obj.setDefaultValue('services/accountant/enabled', 'false')
 
-    conf_obj.setDefaultValue('services/api-router/enabled', 'false')
-    conf_obj.setDefaultValue('services/api-router/host', '127.0.0.1')
-    conf_obj.setDefaultValue('services/api-router/port', settings.DefaultWebSocketRouterPort())
-
     conf_obj.setDefaultValue('services/backup-db/enabled', 'true')
 
     conf_obj.setDefaultValue('services/backups/enabled', 'true')

bitdust/main/config_types.py

@@ -98,9 +98,6 @@ def defaults():
         'paths/restore': TYPE_FOLDER_PATH,
         'personal/private-key-size': TYPE_POSITIVE_INTEGER,
         'services/accountant/enabled': TYPE_BOOLEAN,
-        'services/api-router/enabled': TYPE_BOOLEAN,
-        'services/api-router/host': TYPE_STRING,
-        'services/api-router/port': TYPE_PORT_NUMBER,
         'services/backup-db/enabled': TYPE_BOOLEAN,
         'services/backups/block-size': TYPE_DISK_SPACE,
         'services/backups/enabled': TYPE_BOOLEAN,

bitdust/storage/keys_synchronizer.py

@@ -323,6 +323,7 @@ def doRestoreKeys(self, *args, **kwargs):
             if _Debug:
                 lg.args(_DebugLevel, unreliable_keys=self.unreliable_keys)
             lg.err('not possible to restore any keys, all backup copies unreliable stored_keys=%d not_stored_keys=%d unreliable_keys=%d' % (len(self.stored_keys), len(self.not_stored_keys), len(self.unreliable_keys)))
+            lg.admin('not possible to restore any keys, all known backup copies are unreliable')
             self.automat('error', Exception('not possible to restore any keys, all backup copies unreliable'))
             return
         keys_to_be_restored = []

bitdust/supplier/customer_space.py

@@ -806,6 +806,7 @@ def on_identity_url_changed(evt):
             customer_idurl.refresh()
             contacts_changed = True
             lg.info('found customer idurl rotated : %r -> %r' % (evt.data['old_idurl'], evt.data['new_idurl']))
+            lg.admin('found customer %r idurl rotated to %r' % (evt.data['old_idurl'], evt.data['new_idurl']))
     if contacts_changed:
         contactsdb.save_customers()
     # update meta info for that customer
@@ -985,6 +986,7 @@ def on_service_supplier_request(json_payload, newpacket, info):
         else:
             lg.info('OLD CUSTOMER: DENIED     not enough space available')
             events.send('existing-customer-denied', data=dict(idurl=customer_idurl))
+            lg.admin('existing customer %s service denied because of not enough space available' % customer_idurl)
         return p2p_service.SendAck(newpacket, 'deny:{"reason": "not enough space available"}')
     free_bytes = free_bytes - bytes_for_customer
     current_customers.append(customer_idurl)
@@ -1012,6 +1014,7 @@ def on_service_supplier_request(json_payload, newpacket, info):
                 contract=current_contract,
             )
         )
+        lg.admin('new customer %s service accepted' % customer_idurl)
     else:
         lg.info('EXISTING CUSTOMER: ACCEPTED  %s family_position=%s ecc_map=%s allocated_bytes=%s' % (customer_idurl, family_position, ecc_map, bytes_for_customer))
         events.send(
@@ -1071,6 +1074,7 @@ def on_service_supplier_cancel(json_payload, newpacket, info):
     reactor.callLater(0, local_tester.TestUpdateCustomers)  # @UndefinedVariable
     lg.info('EXISTING CUSTOMER TERMINATED %r' % customer_idurl)
     events.send('existing-customer-terminated', data=dict(idurl=customer_idurl, ecc_map=customer_ecc_map))
+    lg.admin('existing customer %s service terminated' % customer_idurl)
     return p2p_service.SendAck(newpacket, 'accepted')
 
 

bitdust/transport/proxy/proxy_router.py

@@ -961,6 +961,7 @@ def _do_register_route(self, idurl, ident_obj):
         self.routes[idurl.original()]['connection_info'] = None
         self.closed_routes.pop(idurl.original(), None)
         self.closed_routes.pop(idurl.to_bin(), None)
+        lg.admin('added route for %r' % idurl.original())
 
     def _do_unregister_route(self, idurl):
         idurl = id_url.field(idurl)
@@ -979,6 +980,7 @@ def _do_unregister_route(self, idurl):
         self.routes.pop(idurl.to_bin(), None)
         self.closed_routes[idurl.original()] = time.time()
         self.closed_routes[idurl.to_bin()] = time.time()
+        lg.admin('removed route for %r' % idurl.original())
 
     def _on_routed_in_packet_failed(self, pkt_out, msg, newpacket, info, receiver_idurl):
         lg.err('routed packet transfer failed: %r %r %r %r %r' % (pkt_out, msg, newpacket, info, receiver_idurl))
@@ -1304,6 +1306,7 @@ def _on_identity_url_changed(self, evt):
             if new_ident:
                 self.routes[new]['identity_rev'] = new_ident.getRevisionValue()
             lg.info('replaced route for user after identity rotate detected : %r -> %r' % (old, new))
+            lg.admin('replaced route for %r after identity rotate to %r' % (old, new))
 
     def _is_my_contacts_present_in_identity(self, ident):
         for my_contact in my_id.getLocalIdentity().getContacts():