@@ -1041,7 +1041,7 @@ def msgParsator(self, ims=None, framed=True, pipeline=False,
1041
1041
1042
1042
elif ilk in [Ilks .rct ]: # event receipt msg (nontransferable)
1043
1043
if not (cigars or wigers or tsgs ):
1044
- logger .debug ("Parser: Missing attached signatures on receipt msg = %s. " , serder .ked )
1044
+ logger .debug ("Parser: Missing attached signatures on receipt msg event = \n %s \n " , serder .pretty () )
1045
1045
raise kering .ValidationError (f"Missing attached sigs on receipt msg={ serder .ked ['d' ]} " )
1046
1046
1047
1047
try :
@@ -1055,13 +1055,17 @@ def msgParsator(self, ims=None, framed=True, pipeline=False,
1055
1055
kvy .processReceiptTrans (serder = serder , tsgs = tsgs )
1056
1056
1057
1057
except AttributeError :
1058
- raise kering .ValidationError ("No kevery to process so dropped msg"
1059
- "= {}." .format (serder .pretty ()))
1058
+ msg = f"No kevery to process so dropped msg = { serder .said } "
1059
+ logger .info ("Parser: %s" , msg )
1060
+ logger .debug ("Event body=\n %s\n " , serder .pretty ())
1061
+ raise kering .ValidationError (msg )
1060
1062
1061
1063
elif ilk in (Ilks .rpy ,): # reply message
1062
1064
if not (cigars or tsgs ):
1063
- raise kering .ValidationError ("Missing attached endorser signature(s) "
1064
- "to reply msg = {}." .format (serder .pretty ()))
1065
+ msg = f"Missing attached endorser signature(s) to reply msg = { serder .said } "
1066
+ logger .info ("Parser: %s" , msg )
1067
+ logger .debug ("Event body=\n %s\n " , serder .pretty ())
1068
+ raise kering .ValidationError (msg )
1065
1069
1066
1070
try :
1067
1071
if cigars : # process separately so do not clash on errors
@@ -1071,8 +1075,10 @@ def msgParsator(self, ims=None, framed=True, pipeline=False,
1071
1075
rvy .processReply (serder , tsgs = tsgs ) # trans
1072
1076
1073
1077
except AttributeError as e :
1074
- raise kering .ValidationError ("No kevery to process so dropped msg"
1075
- "= {}." .format (serder .pretty ()))
1078
+ msg = f"No kevery to process so dropped msg = { serder .said } "
1079
+ logger .info ("Parser: %s" , msg )
1080
+ logger .debug ("Event body=\n %s\n " , serder .pretty ())
1081
+ raise kering .ValidationError (msg )
1076
1082
except kering .UnverifiedReplyError as e :
1077
1083
if logger .isEnabledFor (logging .DEBUG ):
1078
1084
logger .exception ("Error processing reply = %s" , e )
@@ -1091,16 +1097,20 @@ def msgParsator(self, ims=None, framed=True, pipeline=False,
1091
1097
args ["cigars" ] = cigars
1092
1098
1093
1099
else :
1094
- raise kering .ValidationError ("Missing attached requester signature(s) "
1095
- "to key log query msg = {}." .format (serder .pretty ()))
1100
+ msg = f"Missing attached requester signature(s) to key log query msg = { serder .said } "
1101
+ logger .info ("Parser: %s" , msg )
1102
+ logger .debug ("Event body=\n %s\n " , serder .pretty ())
1103
+ raise kering .ValidationError (msg )
1096
1104
1097
1105
route = serder .ked ["r" ]
1098
1106
if route in ["logs" , "ksn" , "mbx" ]:
1099
1107
try :
1100
1108
kvy .processQuery (** args )
1101
1109
except AttributeError :
1102
- raise kering .ValidationError ("No kevery to process so dropped msg"
1103
- "= {}." .format (serder .pretty ()))
1110
+ msg = f"No kevery to process so dropped msg = { serder .said } "
1111
+ logger .info ("Parser: %s" , msg )
1112
+ logger .debug ("Event body=\n %s\n " , serder .pretty ())
1113
+ raise kering .ValidationError (msg )
1104
1114
except kering .QueryNotFoundError as e : # catch escrow error and log it
1105
1115
if logger .isEnabledFor (logging .TRACE ):
1106
1116
logger .exception ("Error processing query = %s" , e )
@@ -1112,12 +1122,16 @@ def msgParsator(self, ims=None, framed=True, pipeline=False,
1112
1122
try :
1113
1123
tvy .processQuery (** args )
1114
1124
except AttributeError as e :
1115
- raise kering .ValidationError ("No tevery to process so dropped msg"
1116
- "= {} from {}." .format (serder .pretty (), e ))
1125
+ msg = f"No tevery to process so dropped msg = { serder .said } from { e } "
1126
+ logger .info ("Parser: %s" , msg )
1127
+ logger .debug ("Event body=\n %s\n " , serder .pretty ())
1128
+ raise kering .ValidationError (msg )
1117
1129
1118
1130
else :
1119
- raise kering .ValidationError ("Invalid resource type {} so dropped msg"
1120
- "= {}." .format (route , serder .pretty ()))
1131
+ msg = f"Invalid resource type { route } so dropped msg = { serder .said } "
1132
+ logger .info ("Parser: %s" , msg )
1133
+ logger .debug ("Event body=\n %s\n " , serder .pretty ())
1134
+ raise kering .ValidationError (msg )
1121
1135
1122
1136
elif ilk in (Ilks .exn ,):
1123
1137
args = dict (serder = serder )
@@ -1132,8 +1146,10 @@ def msgParsator(self, ims=None, framed=True, pipeline=False,
1132
1146
exc .processEvent (tsgs = tsgs , ** args )
1133
1147
1134
1148
except AttributeError :
1135
- raise kering .ValidationError ("No Exchange to process so dropped msg"
1136
- "= {}." .format (serder .pretty ()))
1149
+ msg = "No Exchange to process so dropped msg = {serder.said}"
1150
+ logger .info ("Parser: %s" , msg )
1151
+ logger .debug ("Event body=\n %s\n " , serder .pretty ())
1152
+ raise kering .ValidationError (msg )
1137
1153
1138
1154
elif ilk in (Ilks .vcp , Ilks .vrt , Ilks .iss , Ilks .rev , Ilks .bis , Ilks .brv ):
1139
1155
# TEL msg
@@ -1143,11 +1159,15 @@ def msgParsator(self, ims=None, framed=True, pipeline=False,
1143
1159
tvy .processEvent (serder = serder , seqner = seqner , saider = saider , wigers = wigers )
1144
1160
1145
1161
except AttributeError as e :
1146
- raise kering .ValidationError ("No tevery to process so dropped msg"
1147
- "= {}." .format (serder .pretty ()))
1162
+ msg = f"No Tevery to process so dropped msg = { serder .said } "
1163
+ logger .info ("Parser: %s" , msg )
1164
+ logger .debug ("Event body=\n %s\n " , serder .pretty ())
1165
+ raise kering .ValidationError (msg )
1148
1166
else :
1149
- raise kering .ValidationError ("Unexpected message ilk = {} for evt ="
1150
- " {}." .format (ilk , serder .pretty ()))
1167
+ msg = f"Unexpected message ilk = { ilk } for evt = { serder .said } "
1168
+ logger .info ("Parser: %s" , msg )
1169
+ logger .debug ("Event body=\n %s\n " , serder .pretty ())
1170
+ raise kering .ValidationError (msg )
1151
1171
1152
1172
elif isinstance (serder , serdering .SerderACDC ):
1153
1173
ilk = serder .ilk # dispatch based on ilk
@@ -1157,14 +1177,20 @@ def msgParsator(self, ims=None, framed=True, pipeline=False,
1157
1177
prefixer , seqner , saider = ssts [- 1 ] if ssts else (None , None , None ) # use last one if more than one
1158
1178
vry .processCredential (creder = serder , prefixer = prefixer , seqner = seqner , saider = saider )
1159
1179
except AttributeError as e :
1160
- raise kering .ValidationError ("No verifier to process so dropped credential"
1161
- "= {}." .format (serder .pretty ()))
1180
+ msg = f"No verifier to process so dropped credential { serder .said } "
1181
+ logger .info ("Parser: %s" , msg )
1182
+ logger .debug ("Credential body=\n %s\n " , serder .pretty ())
1183
+ raise kering .ValidationError (msg )
1162
1184
else :
1163
- raise kering .ValidationError ("Unexpected message ilk = {} for evt ="
1164
- " {}." .format (ilk , serder .pretty ()))
1185
+ msg = f"Unexpected message ilk = { ilk } for evt = { serder .said } "
1186
+ logger .info ("Parser: %s" , msg )
1187
+ logger .debug ("Event body=\n %s\n " , serder .pretty ())
1188
+ raise kering .ValidationError (msg )
1165
1189
1166
1190
else :
1167
- raise kering .ValidationError ("Unexpected protocol type = {} for event message ="
1168
- " {}." .format (serder .proto , serder .pretty ()))
1191
+ msg = f"Unexpected protocol type = { serder .proto } for event message = { serder .said } "
1192
+ logger .info ("Parser: %s" , msg )
1193
+ logger .debug ("Event body=\n %s\n " , serder .pretty ())
1194
+ raise kering .ValidationError (msg )
1169
1195
1170
1196
return True # done state
0 commit comments