Skip to content

Commit

Permalink
chg: [multilinelog] change msg to message
Browse files Browse the repository at this point in the history
  • Loading branch information
@cvandeplas
cvandeplas committed Nov 26, 2024
1 parent 5b4f286 commit 9f352b3
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions src/sysdiagnose/utils/multilinelog.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,15 @@ def build_from_logentry(line, tzinfo):
# plist parsing
if line.endswith('</plist>'):
plist_start = line.index('<?xml version')
entry['msg'] = line[:plist_start].strip()
entry['message'] = line[:plist_start].strip()
plist_data = line[plist_start:]
entry['plist'] = misc.load_plist_string_as_json(plist_data)
# LATER parse the plist content
# - extract the recursive plist
# - decode the certificates into nice JSON
# - and so on with more fun for the future
else:
entry['msg'] = msgregex.group(1).strip()
entry['message'] = msgregex.group(1).strip()

return entry

Expand Down
22 changes: 11 additions & 11 deletions tests/test_multilinelog.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def test_multilinelog_plist(self):
'loglevel': 'debug',
'hexID': '0x16bf9b000',
'event_type': 'MobileActivationDaemon handleActivationInfoWithSession:activationSignature:completionBlock:',
'msg': 'Activation message:',
'message': 'Activation message:',
'plist': {'AccountToken': 'test', 'AccountTokenCertificate': 'test', 'unbrick': True}}
result = multilinelog.extract_from_string(s, tzinfo=self.tzinfo)
self.assertDictEqual(expected_result, result[0])
Expand Down Expand Up @@ -69,7 +69,7 @@ def test_multilinelog_curlybrackets(self):
'datetime': '2023-05-24T14:05:36.000000+01:00',
'loglevel': 'err',
'hexID': '0x16be43000',
'msg': '+[MCMMetadata readAndValidateMetadataAtFileUrl:forUserIdentity:containerClass:checkClassPath:transient:error:]: 199: Failed to validate metadata at URL [file:///private/var/mobile/Containers/Data/Application/0984009B-81D1-4F7F-BDBD-261E22059155/.com.apple.mobile_container_manager.metadata.plist]: {\n MCMMetadataActiveDPClass = 0;\n MCMMetadataContentClass = 2;\n MCMMetadataIdentifier = "com.apple.VoiceMemos";\n MCMMetadataInfo = {\n "com.apple.MobileInstallation.ContentProtectionClass" = 0;\n };\n MCMMetadataSchemaVersion = 1;\n MCMMetadataUUID = "12036663-1F3A-45B3-A34C-402D5BB7D4FB";\n MCMMetadataUserIdentity = {\n personaUniqueString = "83CB8039-725D-4462-84C2-7F79F0A6EFB3";\n posixGID = 501;\n posixUID = 501;\n type = 0;\n version = 2;\n };\n MCMMetadataVersion = 6;\n} (Error Domain=MCMErrorDomain Code=29 "Invalid metadata-URLs should match: /private/var/mobile/Containers/Data/Application/0984009B-81D1-4F7F-BDBD-261E22059155 : /private/var/mobile/Containers/Data/VPNPlugin/0984009B-81D1-4F7F-BDBD-261E22059155" UserInfo={SourceFileLine=370, NSLocalizedDescription=Invalid metadata-URLs should match: /private/var/mobile/Containers/Data/Application/0984009B-81D1-4F7F-BDBD-261E22059155 : /private/var/mobile/Containers/Data/VPNPlugin/0984009B-81D1-4F7F-BDBD-261E22059155, FunctionName=+[MCMMetadata _readAndValidateMetadataInDictionary:containerURL:forUserIdentity:containerClass:checkClassPath:fsNode:transient:error:]})'}
'message': '+[MCMMetadata readAndValidateMetadataAtFileUrl:forUserIdentity:containerClass:checkClassPath:transient:error:]: 199: Failed to validate metadata at URL [file:///private/var/mobile/Containers/Data/Application/0984009B-81D1-4F7F-BDBD-261E22059155/.com.apple.mobile_container_manager.metadata.plist]: {\n MCMMetadataActiveDPClass = 0;\n MCMMetadataContentClass = 2;\n MCMMetadataIdentifier = "com.apple.VoiceMemos";\n MCMMetadataInfo = {\n "com.apple.MobileInstallation.ContentProtectionClass" = 0;\n };\n MCMMetadataSchemaVersion = 1;\n MCMMetadataUUID = "12036663-1F3A-45B3-A34C-402D5BB7D4FB";\n MCMMetadataUserIdentity = {\n personaUniqueString = "83CB8039-725D-4462-84C2-7F79F0A6EFB3";\n posixGID = 501;\n posixUID = 501;\n type = 0;\n version = 2;\n };\n MCMMetadataVersion = 6;\n} (Error Domain=MCMErrorDomain Code=29 "Invalid metadata-URLs should match: /private/var/mobile/Containers/Data/Application/0984009B-81D1-4F7F-BDBD-261E22059155 : /private/var/mobile/Containers/Data/VPNPlugin/0984009B-81D1-4F7F-BDBD-261E22059155" UserInfo={SourceFileLine=370, NSLocalizedDescription=Invalid metadata-URLs should match: /private/var/mobile/Containers/Data/Application/0984009B-81D1-4F7F-BDBD-261E22059155 : /private/var/mobile/Containers/Data/VPNPlugin/0984009B-81D1-4F7F-BDBD-261E22059155, FunctionName=+[MCMMetadata _readAndValidateMetadataInDictionary:containerURL:forUserIdentity:containerClass:checkClassPath:fsNode:transient:error:]})'}
result = multilinelog.extract_from_string(s, tzinfo=self.tzinfo)
self.assertDictEqual(expected_result, result[0])

Expand All @@ -81,7 +81,7 @@ def test_multilinelog_simple_1(self):
'loglevel': 'notice',
'hexID': '0x16afb3000',
'event_type': 'MCMClientConnection _regenerateAllSystemContainerPaths',
'msg': 'Rolling system container directory UUIDs on disk'}
'message': 'Rolling system container directory UUIDs on disk'}
result = multilinelog.extract_from_string(s, tzinfo=self.tzinfo)
self.assertDictEqual(expected_result, result[0])

Expand All @@ -92,7 +92,7 @@ def test_mutlinelog_simple_2(self):
'datetime': '2023-05-24T14:05:30.000000+01:00',
'loglevel': 'notice',
'hexID': '0x16be43000',
'msg': '_containermanagerd_init_block_invoke: containermanagerd first boot cleanup complete'}
'message': '_containermanagerd_init_block_invoke: containermanagerd first boot cleanup complete'}
result = multilinelog.extract_from_string(s, tzinfo=self.tzinfo)
self.assertDictEqual(expected_result, result[0])

Expand All @@ -104,14 +104,14 @@ def test_multilinelog_simple_multiplelines(self):
'datetime': '2023-05-24T14:05:30.000000+01:00',
'loglevel': 'notice',
'hexID': '0x16be43000',
'msg': '_containermanagerd_init_block_invoke: containermanagerd first boot cleanup complete'}
'message': '_containermanagerd_init_block_invoke: containermanagerd first boot cleanup complete'}
expected_result_1 = {
'timestamp': 1684932937.0,
'datetime': '2023-05-24T13:55:37.000000+01:00',
'loglevel': 'notice',
'hexID': '0x16afb3000',
'event_type': 'MCMClientConnection _regenerateAllSystemContainerPaths',
'msg': 'Rolling system container directory UUIDs on disk'}
'message': 'Rolling system container directory UUIDs on disk'}
result = multilinelog.extract_from_string(s, tzinfo=self.tzinfo)
self.assertDictEqual(expected_result_0, result[0])
self.assertDictEqual(expected_result_1, result[1])
Expand Down Expand Up @@ -146,13 +146,13 @@ def test_multilinelog_keyvalue(self):
'loglevel': 'notice',
'hexID': '0x16afb3000',
'event_type': 'MCMClientConnection _regenerateAllSystemContainerPaths',
'msg': 'Rolling system container directory UUIDs on disk'}
'message': 'Rolling system container directory UUIDs on disk'}
expected_result_1 = {
'timestamp': 1684933693.0,
'datetime': '2023-05-24T14:08:13.000000+01:00',
'loglevel': 'debug',
'hexID': '0x16f1db000',
'msg': 'MA: main: ____________________ Mobile Activation Startup _____________________',
'message': 'MA: main: ____________________ Mobile Activation Startup _____________________',
'build_version': '19H349',
'internal_build': 'false',
'uid': '501',
Expand Down Expand Up @@ -180,13 +180,13 @@ def test_multilinelog_keyvalue_onlyend(self):
'datetime': '2023-02-18T10:48:38.000000+01:00',
'loglevel': 'debug',
'hexID': '0x16dc37000',
'msg': 'MA: main: ____________________________________________________________________'}
'message': 'MA: main: ____________________________________________________________________'}
expected_result_1 = {
'timestamp': 1676713719.0,
'datetime': '2023-02-18T10:48:39.000000+01:00',
'loglevel': 'debug',
'hexID': '0x16dc37000',
'msg': 'MA: dealwith_activation: Activation State: Activated'}
'message': 'MA: dealwith_activation: Activation State: Activated'}
result = multilinelog.extract_from_string(s, tzinfo=self.tzinfo)
self.assertDictEqual(expected_result_0, result[0])
self.assertDictEqual(expected_result_1, result[1])
Expand All @@ -198,7 +198,7 @@ def test_multilinelog_keyvalue_onlystart(self):
'datetime': '2022-12-02T12:32:19.000000+01:00',
'loglevel': 'debug',
'hexID': '0x16afff000',
'msg': 'MA: main: ____________________ Mobile Activation Startup _____________________'}
'message': 'MA: main: ____________________ Mobile Activation Startup _____________________'}
result = multilinelog.extract_from_string(s, tzinfo=self.tzinfo)
self.assertDictEqual(expected_result, result[0])

Expand Down

0 comments on commit 9f352b3

Please sign in to comment.