refactor: remove class name prefixes

src/keri/app/cli/commands/ipex/join.py

@@ -104,7 +104,7 @@ def joinDo(self, tymth, tock=0.0):
         self.tock = tock
         _ = (yield self.tock)
 
-        print("IPEX JoinDoer: Waiting for group ipex events...")
+        print("Waiting for group ipex events...")
 
         while True:
 

src/keri/app/cli/commands/multisig/incept.py

@@ -156,7 +156,7 @@ def inceptDo(self, tymth, tock=0.0):
                                   serder=exn,
                                   attachment=ims)
 
-            logger.info(f"MS Incept: Group identifier inception initialized for {ghab.pre}")
+            logger.info(f"Group identifier inception initialized for {ghab.pre}")
             prefixer = coring.Prefixer(qb64=ghab.pre)
             seqner = coring.Seqner(sn=0)
             saider = coring.Saider(qb64=prefixer.qb64)

src/keri/app/cli/commands/multisig/join.py

@@ -111,7 +111,7 @@ def joinDo(self, tymth, tock=0.0):
         self.tock = tock
         _ = (yield self.tock)
 
-        print("MS JoinDoer: Waiting for group multisig events...")
+        print("Waiting for group multisig events...")
 
         while self.notifier.noter.notes.cntAll() == 0:
             yield self.tock

src/keri/app/cli/commands/witness/demo.py

@@ -8,6 +8,7 @@
 
 import argparse
 import logging
+import os
 
 from hio.base import doing
 
@@ -16,18 +17,21 @@
 from keri import help
 
 parser = argparse.ArgumentParser(description="Run a demo collection of witnesses")
+parser.add_argument("--loglevel", action="store", required=False, default=os.getenv("KERIA_LOG_LEVEL", "CRITICAL"),
+                    help="Set log level to DEBUG | INFO | WARNING | ERROR | CRITICAL. Default is CRITICAL")
 parser.set_defaults(handler=lambda args: demo(args))
 
 
-help.ogler.level = logging.INFO
 logger = help.ogler.getLogger()
 
 
-def demo(_):
+def demo(args):
     """
     Run set of three witnesses for demo
 
     """
+    help.ogler.level = logging.getLevelName(args.loglevel.upper())
+    logger.setLevel(help.ogler.level)
 
     wancf = configing.Configer(name="wan", headDirPath="scripts", temp=False, reopen=True, clear=False)
     wilcf = configing.Configer(name="wil", headDirPath="scripts", temp=False, reopen=True, clear=False)

src/keri/app/delegating.py

@@ -188,7 +188,7 @@ def processPartialWitnessEscrow(self):
                             witnessed = True
                     if not witnessed:
                         continue
-                print(f"Sealer: Witness receipts complete, {pre} confirmed.")
+                print(f"Witness receipts complete, {pre} confirmed.")
                 self.hby.db.dpwe.rem(keys=(pre, said))
                 self.hby.db.cdel.put(keys=(pre, seqner.qb64), val=coring.Saider(qb64=serder.said))
 

src/keri/app/grouping.py

@@ -51,7 +51,7 @@ def start(self, ghab, prefixer, seqner, saider):
         serder = serdering.SerderKERI(raw=evt)
         del evt[:serder.size]
 
-        logger.info(f"Counselor: Multisig start; Waiting for other signatures for {serder.ilk} {serder.pre}:{seqner.sn}...")
+        logger.info(f"Waiting for other signatures for {serder.ilk} {serder.pre}:{seqner.sn}...")
         return self.hby.db.gpse.add(keys=(prefixer.qb64,), val=(seqner, saider))
 
     def complete(self, prefixer, seqner, saider=None):
@@ -133,7 +133,7 @@ def processPartialSignedEscrow(self):
                 if kever.delegated and kever.ilk in (coring.Ilks.dip, coring.Ilks.drt):
                     # We are a delegated identifier, must wait for delegator approval for dip and drt
                     if witered:  # We are elected to perform delegation and witnessing messaging
-                        logger.info(f"Counselor: We are the witnesser, sending {pre} to delegator")
+                        logger.info(f"We are the witnesser, sending {pre} to delegator")
                         self.swain.delegation(pre=pre, sn=seqner.sn)
                     else:
                         anchor = dict(i=pre, s=seqner.snh, d=saider.qb64)
@@ -142,15 +142,15 @@ def processPartialSignedEscrow(self):
                         else:
                             self.witq.query(src=ghab.mhab.pre, pre=kever.delegator, anchor=anchor)
 
-                    logger.info(f"Counselor: Waiting for delegation approval...")
+                    logger.info(f"Waiting for delegation approval...")
                     self.hby.db.gdee.add(keys=(pre,), val=(seqner, saider))
                 else:  # Non-delegation, move on to witnessing
                     if witered:  # We are elected witnesser, send off event to witnesses
-                        logger.info(f"Counselor: We are the fully signed witnesser {seqner.sn}, sending to witnesses")
+                        logger.info(f"We are the fully signed witnesser {seqner.sn}, sending to witnesses")
                         self.witDoer.msgs.append(dict(pre=pre, sn=seqner.sn))
 
                     # Move to escrow waiting for witness receipts
-                    logger.info(f"Counselor: Waiting for fully signed witness receipts for {seqner.sn}")
+                    logger.info(f"Waiting for fully signed witness receipts for {seqner.sn}")
                     self.hby.db.gpwe.add(keys=(pre,), val=(seqner, saider))
 
     def processDelegateEscrow(self):
@@ -170,7 +170,7 @@ def processDelegateEscrow(self):
             if witer:  # We are elected witnesser, We've already done out part in Boatswain, we are done.
                 if self.swain.complete(prefixer=kever.prefixer, seqner=coring.Seqner(sn=kever.sn)):
                     self.hby.db.gdee.rem(keys=(pre,))
-                    logger.info(f"Counselor: Delegation approval for {pre} received.")
+                    logger.info(f"Delegation approval for {pre} received.")
 
                     self.hby.db.cgms.put(keys=(pre, seqner.qb64), val=saider)
 
@@ -181,10 +181,10 @@ def processDelegateEscrow(self):
                     dgkey = dbing.dgKey(pre, saider.qb64b)
                     self.hby.db.setAes(dgkey, couple)  # authorizer event seal (delegator/issuer)
                     self.hby.db.gdee.rem(keys=(pre,))
-                    logger.info(f"Counselor: Delegation approval for {pre} received.")
+                    logger.info(f"Delegation approval for {pre} received.")
 
                     # Move to escrow waiting for witness receipts
-                    logger.info(f"Counselor: Waiting for witness receipts for {pre}")
+                    logger.info(f"Waiting for witness receipts for {pre}")
                     self.hby.db.gdee.rem(keys=(pre,))
                     self.hby.db.gpwe.add(keys=(pre,), val=(seqner, saider))
 
@@ -212,7 +212,7 @@ def processPartialWitnessEscrow(self):
                             witnessed = True
                     if not witnessed:
                         continue
-                logger.info(f"Counselor: Witness receipts complete, {pre} confirmed.")
+                logger.info(f"Witness receipts complete, {pre} confirmed.")
                 self.hby.db.gpwe.rem(keys=(pre,))
                 self.hby.db.cgms.put(keys=(pre, seqner.qb64), val=saider)
             elif not witer:
@@ -243,7 +243,7 @@ def handle(self, serder, attachments=None):
             attachments (list): list of tuples of pather, CESR SAD path attachments to the exn event
 
         """
-        logger.info("MultisigNotificationHandler: handling %s event SAID=%s", self.resource, serder.said)
+        logger.info("handling %s event SAID=%s", self.resource, serder.said)
         self.mux.add(serder=serder)
 
 

src/keri/core/eventing.py

@@ -2703,7 +2703,7 @@ def logEvent(self, serder, sigers=None, wigers=None, wits=None, first=False,
                 if self.cues is not None:  # cue to notice BadCloneFN
                     self.cues.push(dict(kin="noticeBadCloneFN", serder=serder,
                                           fn=fn, firner=firner, dater=dater))
-                logger.info("Kever: Mismatch Cloned Replay FN: First seen "
+                logger.info("Mismatch Cloned Replay FN: First seen "
                             "ordinal fn %s dig %s and clone fn %s event=%s",
                             fn, serder.pre, firner.sn, serder.said)
                 logger.debug("Event Body=\n%s\n", serder.pretty())
@@ -2715,8 +2715,9 @@ def logEvent(self, serder, sigers=None, wigers=None, wits=None, first=False,
                          fn, serder.ilk, serder.said, serder.pre, dtsb.decode("utf-8"))
             logger.debug("Event Body=\n%s\n", serder.pretty())
         self.db.addKe(snKey(serder.preb, serder.sn), serder.saidb)
-        logger.info("Kever [%.8s]: Added to KEL %s at sn=%s valid event SAID=%s for AID %s",
-                    self.prefixer.qb64, serder.ilk, serder.sn, serder.said, serder.pre)
+        pre = self.prefixer.qb64
+        logger.info("[AID %s...%s]: Added to KEL %s at sn=%s valid event SAID=%s for AID %s",
+                    pre[:4], pre[-4:], serder.ilk, serder.sn, serder.said, serder.pre)
         logger.debug("Event Body=\n%s\n", serder.pretty())
         return (fn, dtsb.decode("utf-8"))  # (fn int, dts str) if first else (None, dts str)
 

src/keri/core/parsing.py

@@ -1056,14 +1056,14 @@ def msgParsator(self, ims=None, framed=True, pipeline=False,
 
                 except AttributeError:
                     msg = f"No kevery to process so dropped msg = {serder.said}"
-                    logger.info("Parser: %s", msg)
+                    logger.info(msg)
                     logger.debug("Event body=\n%s\n", serder.pretty())
                     raise kering.ValidationError(msg)
 
             elif ilk in (Ilks.rpy,):  # reply message
                 if not (cigars or tsgs):
                     msg = f"Missing attached endorser signature(s) to reply msg = {serder.said}"
-                    logger.info("Parser: %s", msg)
+                    logger.info(msg)
                     logger.debug("Event body=\n%s\n", serder.pretty())
                     raise kering.ValidationError(msg)
 
@@ -1076,7 +1076,7 @@ def msgParsator(self, ims=None, framed=True, pipeline=False,
 
                 except AttributeError as e:
                     msg = f"No kevery to process so dropped msg = {serder.said}"
-                    logger.info("Parser: %s", msg)
+                    logger.info(msg)
                     logger.debug("Event body=\n%s\n", serder.pretty())
                     raise kering.ValidationError(msg)
                 except kering.UnverifiedReplyError as e:
@@ -1098,7 +1098,7 @@ def msgParsator(self, ims=None, framed=True, pipeline=False,
 
                 else:
                     msg = f"Missing attached requester signature(s) to key log query msg = {serder.said}"
-                    logger.info("Parser: %s", msg)
+                    logger.info(msg)
                     logger.debug("Event body=\n%s\n", serder.pretty())
                     raise kering.ValidationError(msg)
 
@@ -1108,7 +1108,7 @@ def msgParsator(self, ims=None, framed=True, pipeline=False,
                         kvy.processQuery(**args)
                     except AttributeError:
                         msg = f"No kevery to process so dropped msg = {serder.said}"
-                        logger.info("Parser: %s", msg)
+                        logger.info(msg)
                         logger.debug("Event body=\n%s\n", serder.pretty())
                         raise kering.ValidationError(msg)
                     except kering.QueryNotFoundError as e: # catch escrow error and log it
@@ -1123,13 +1123,13 @@ def msgParsator(self, ims=None, framed=True, pipeline=False,
                         tvy.processQuery(**args)
                     except AttributeError as e:
                         msg = f"No tevery to process so dropped msg = {serder.said} from {e}"
-                        logger.info("Parser: %s", msg)
+                        logger.info(msg)
                         logger.debug("Event body=\n%s\n", serder.pretty())
                         raise kering.ValidationError(msg)
 
                 else:
                     msg = f"Invalid resource type {route} so dropped msg = {serder.said}"
-                    logger.info("Parser: %s", msg)
+                    logger.info(msg)
                     logger.debug("Event body=\n%s\n", serder.pretty())
                     raise kering.ValidationError(msg)
 
@@ -1147,7 +1147,7 @@ def msgParsator(self, ims=None, framed=True, pipeline=False,
 
                 except AttributeError:
                     msg = "No Exchange to process so dropped msg = {serder.said}"
-                    logger.info("Parser: %s", msg)
+                    logger.info(msg)
                     logger.debug("Event body=\n%s\n", serder.pretty())
                     raise kering.ValidationError(msg)
 
@@ -1160,12 +1160,12 @@ def msgParsator(self, ims=None, framed=True, pipeline=False,
 
                 except AttributeError as e:
                     msg = f"No Tevery to process so dropped msg = {serder.said}"
-                    logger.debug("Parser: %s", msg)
+                    logger.debug(msg)
                     logger.debug("Event body=\n%s\n", serder.pretty())
                     raise kering.ValidationError(msg)
             else:
                 msg = f"Unexpected message ilk = {ilk} for evt = {serder.said}"
-                logger.info("Parser: %s", msg)
+                logger.info(msg)
                 logger.debug("Event body=\n%s\n", serder.pretty())
                 raise kering.ValidationError(msg)
 
@@ -1178,18 +1178,18 @@ def msgParsator(self, ims=None, framed=True, pipeline=False,
                     vry.processCredential(creder=serder, prefixer=prefixer, seqner=seqner, saider=saider)
                 except AttributeError as e:
                     msg = f"No verifier to process so dropped credential {serder.said}"
-                    logger.debug("Parser: %s", msg)
+                    logger.debug(msg)
                     logger.debug("Credential body=\n%s\n", serder.pretty())
                     raise kering.ValidationError(msg)
             else:
                 msg = f"Unexpected message ilk = {ilk} for evt = {serder.said}"
-                logger.info("Parser: %s", msg)
+                logger.info(msg)
                 logger.debug("Event body=\n%s\n", serder.pretty())
                 raise kering.ValidationError(msg)
 
         else:
             msg = f"Unexpected protocol type = {serder.proto} for event message = {serder.said}"
-            logger.info("Parser: %s", msg)
+            logger.info(msg)
             logger.debug("Event body=\n%s\n", serder.pretty())
             raise kering.ValidationError(msg)
 

src/keri/db/escrowing.py

@@ -88,7 +88,7 @@ def processEscrowState(self, typ, processReply, extype: Type[Exception]):
 
                 try:
                     if not (dater and serder and (tsgs or vcigars)):
-                        raise ValueError(f"Broker: Missing escrow artifacts at said={saider.qb64}"
+                        raise ValueError(f"Missing escrow artifacts at said={saider.qb64}"
                                          f"for pre={pre}.")
 
                     cigars = []
@@ -101,7 +101,7 @@ def processEscrowState(self, typ, processReply, extype: Type[Exception]):
                     if ((helping.nowUTC() - dater.datetime) >
                             datetime.timedelta(seconds=self.timeout)):
                         # escrow stale so raise ValidationError which unescrows below
-                        msg = f"Broker: {typ} escrow unescrow error: Stale txn state escrow at pre = {pre}"
+                        msg = f"{typ} escrow unescrow error: Stale txn state escrow at pre = {pre}"
                         logger.trace(msg)
                         raise kering.ValidationError(msg)
 
@@ -111,29 +111,29 @@ def processEscrowState(self, typ, processReply, extype: Type[Exception]):
                 except extype as ex:
                     # still waiting on missing prior event to validate
                     if logger.isEnabledFor(logging.TRACE):
-                        logger.trace("Broker: %s escrow unescrow attempt failed: %s\n", typ, ex.args[0])
-                        logger.exception("Broker: %s escrow  unescrow attempt failed: %s\n", typ, ex.args[0])
+                        logger.trace("%s escrow unescrow attempt failed: %s\n", typ, ex.args[0])
+                        logger.exception("%s escrow  unescrow attempt failed: %s\n", typ, ex.args[0])
 
                 except Exception as ex:  # other error so remove from reply escrow
                     self.escrowdb.remIokey(iokeys=(typ, pre, aid, ion))  # remove escrow
                     if logger.isEnabledFor(logging.DEBUG):
-                        logger.exception("Broker: %s escrow other error on unescrow: %s\n", typ, ex.args[0])
+                        logger.exception("%s escrow other error on unescrow: %s\n", typ, ex.args[0])
                     else:
-                        logger.error("Broker: %s escrow other error on unescrow: %s\n", typ, ex.args[0])
+                        logger.error("%s escrow other error on unescrow: %s\n", typ, ex.args[0])
 
                 else:  # unescrow succeded
                     self.escrowdb.remIokey(iokeys=(typ, pre, aid, ion))  # remove escrow only
-                    logger.info("Broker: %s escrow unescrow succeeded for txn state = %s",
+                    logger.info("%s escrow unescrow succeeded for txn state = %s",
                                 typ, serder.said)
                     logger.debug("TXN State Body=\n%s\n", serder.pretty())
 
             except Exception as ex:  # log diagnostics errors etc
                 self.escrowdb.remIokey(iokeys=(typ, pre, aid, ion))  # remove escrow
                 self.removeState(saider)
                 if logger.isEnabledFor(logging.DEBUG):
-                    logger.exception("Broker: %s escrow unescrowed due to error: %s\n", typ, ex.args[0])
+                    logger.exception("%s escrow unescrowed due to error: %s\n", typ, ex.args[0])
                 else:
-                    logger.error("Broker: %s escrow unescrowed due to error: %s\n", typ, ex.args[0])
+                    logger.error("%s escrow unescrowed due to error: %s\n", typ, ex.args[0])
 
     def escrowStateNotice(self, *, typ, pre, aid, serder, saider, dater, cigars=None, tsgs=None):
         """

src/keri/help/__init__.py

@@ -28,15 +28,4 @@ def trace(self, message, *args, **kwargs):
 #  want help.ogler always defined by default
 ogler = ogling.initOgler(prefix='keri', syslogged=False)  # inits once only on first import
 
-#  set log formatters with detailed log output
-logFmt = "%(asctime)s [keri] %(levelname)-8s %(message)s"
-formatter = logging.Formatter(logFmt)
-
-ch = logging.StreamHandler()
-ch.setFormatter(formatter)
-ogler.baseConsoleHandler = ch
-ogler.baseFormatter = formatter
-
-ogler.reopen(headDirPath=ogler.headDirPath)
-
 from .helping import nowIso8601, toIso8601, fromIso8601

src/keri/peer/exchanging.py

@@ -93,7 +93,7 @@ def processEvent(self, serder, tsgs=None, cigars=None, **kwargs):
                     if self.escrowPSEvent(serder=serder, tsgs=tsgs, pathed=pathed):
                         self.cues.append(dict(kin="query", q=dict(r="logs", pre=prefixer.qb64, sn=seqner.snh)))
                     msg = f"Not enough signatures in {indices} for evt = {serder.said}"
-                    logger.info("Exchanger: %s", msg)
+                    logger.info(msg)
                     logger.debug(f"Event body=\n%20\n", serder.pretty())
                     raise MissingSignatureError(msg)
 
@@ -138,7 +138,7 @@ def processEvent(self, serder, tsgs=None, cigars=None, **kwargs):
         try:
             behavior.handle(serder=serder, attachments=attachments)
         except AttributeError:
-            logger.debug(f"Exchanger: Behavior for {route} missing or does not have handle for exn={serder.said}")
+            logger.debug(f"Behavior for {route} missing or does not have handle for exn={serder.said}")
             logger.debug(
                 f"exn body=\n{serder.ked}\n")
 
@@ -231,8 +231,8 @@ def logEvent(self, serder, pathed=None, tsgs=None, cigars=None):
         recipient = serder.ked['rp']
         sender = serder.ked['i']
         route = serder.ked['r']
-        logger.info("Exchanger [%.8s -> %.8s]:  saved exn event route=%s SAID=%s recipient%s",
-                    sender, recipient, route, dig, recipient)
+        logger.info("Saved exn event route = %s SAID = %s sender %s -> recipient %s",
+                    route, dig, sender, recipient)
         logger.debug("EXN Event Body=\n%s\n", serder.pretty())
 
     def lead(self, hab, said):