robin/logsmash
1
0
Fork 0
mirror of https://codeberg.org/icewind/logsmash.git synced 2026-06-03 18:14:11 +02:00
Code Issues Projects Releases 3 Packages Wiki Activity Actions

only test with 29 data for now

Browse source
This commit is contained in:
Robin Appelman 2024-07-22 22:34:56 +02:00
commit 28c93c935c
10 changed files with 8596 additions and 94362 deletions
Download patch file Download diff file Expand all files Collapse all files

22
data/src/data.rs
View file

@ -1,8 +1,8 @@
mod server_24; // mod server_24;
mod server_25; // mod server_25;
mod server_26; // mod server_26;
mod server_27; // mod server_27;
mod server_28; // mod server_28;
mod server_29; mod server_29;
pub const MIN_VERSION: u32 = 24; pub const MIN_VERSION: u32 = 24;
@ -10,12 +10,12 @@ pub const MAX_VERSION: u32 = 29;
pub fn get_statements(name: &str, version: u32) -> &[crate::LoggingStatement] { pub fn get_statements(name: &str, version: u32) -> &[crate::LoggingStatement] {
match (name, version) { match (name, version) {
("server", 24) => server_24::STATEMENTS, // ("server", 24) => server_24::STATEMENTS,
("server", 25) => server_25::STATEMENTS, // ("server", 25) => server_25::STATEMENTS,
("server", 26) => server_26::STATEMENTS, // ("server", 26) => server_26::STATEMENTS,
("server", 27) => server_27::STATEMENTS, // ("server", 27) => server_27::STATEMENTS,
("server", 28) => server_28::STATEMENTS, // ("server", 28) => server_28::STATEMENTS,
("server", 29) => server_29::STATEMENTS, ("server", 29) => server_29::STATEMENTS,
_ => &[], _ => server_29::STATEMENTS,
} }
} }

12193
data/src/data/server_24.rs
View file

File diff suppressed because it is too large Load diff

15633
data/src/data/server_25.rs
View file

File diff suppressed because it is too large Load diff

15965
data/src/data/server_26.rs
View file

File diff suppressed because it is too large Load diff

16493
data/src/data/server_27.rs
View file

File diff suppressed because it is too large Load diff

16933
data/src/data/server_28.rs
View file

File diff suppressed because it is too large Load diff

25652
data/src/data/server_29.rs
View file

File diff suppressed because it is too large Load diff

4
logging-extractor/src/lib.rs
View file

@ -73,7 +73,7 @@ pub fn extract_dir<W: Write>(root: &str, mut output: W, bake: bool) -> Result<()
continue; continue;
} }
for log_item in extractor.extract(rel_path, &code_buff) { for log_item in extractor.extract(rel_path, &code_buff) {
if !first_line { if !bake && !first_line {
writeln!(&mut output, ",").ok(); writeln!(&mut output, ",").ok();
} }
first_line = false; first_line = false;
@ -81,7 +81,7 @@ pub fn extract_dir<W: Write>(root: &str, mut output: W, bake: bool) -> Result<()
if bake { if bake {
bake_buff.clear(); bake_buff.clear();
bake_statement(&mut bake_buff, &log_item); bake_statement(&mut bake_buff, &log_item);
writeln!(&mut output, "{bake_buff}").ok(); writeln!(&mut output, "{bake_buff},").ok();
} else { } else {
let _ = serde_json::to_writer(&mut output, &log_item); let _ = serde_json::to_writer(&mut output, &log_item);
} }

58
logging-extractor/tests/snapshots/snapshot__snapshot_test.snap
View file

@ -11,7 +11,7 @@ expression: output
"exception": "\\Exception", "exception": "\\Exception",
"message_parts": [ "message_parts": [
{ {
"Literal": "invalid share type!" "literal": "invalid share type!"
} }
] ]
}, },
@ -23,13 +23,13 @@ expression: output
"exception": "OC\\Share20\\Exception\\ProviderException", "exception": "OC\\Share20\\Exception\\ProviderException",
"message_parts": [ "message_parts": [
{ {
"Literal": "Group \"" "literal": "Group \""
}, },
{ {
"PlaceHolder": "$share->getSharedWith()" "placeholder": "$share->getSharedWith()"
}, },
{ {
"Literal": "\" does not exist" "literal": "\" does not exist"
} }
] ]
}, },
@ -41,7 +41,7 @@ expression: output
"exception": "OC\\Share20\\Exception\\ProviderException", "exception": "OC\\Share20\\Exception\\ProviderException",
"message_parts": [ "message_parts": [
{ {
"Literal": "Recipient not in receiving group" "literal": "Recipient not in receiving group"
} }
] ]
}, },
@ -53,7 +53,7 @@ expression: output
"exception": "OC\\Share20\\Exception\\ProviderException", "exception": "OC\\Share20\\Exception\\ProviderException",
"message_parts": [ "message_parts": [
{ {
"Literal": "Recipient does not match" "literal": "Recipient does not match"
} }
] ]
}, },
@ -65,7 +65,7 @@ expression: output
"exception": "OC\\Share20\\Exception\\ProviderException", "exception": "OC\\Share20\\Exception\\ProviderException",
"message_parts": [ "message_parts": [
{ {
"Literal": "Invalid shareType" "literal": "Invalid shareType"
} }
] ]
}, },
@ -77,13 +77,13 @@ expression: output
"exception": "OC\\Share20\\Exception\\ProviderException", "exception": "OC\\Share20\\Exception\\ProviderException",
"message_parts": [ "message_parts": [
{ {
"Literal": "Group \"" "literal": "Group \""
}, },
{ {
"PlaceHolder": "$share->getSharedWith()" "placeholder": "$share->getSharedWith()"
}, },
{ {
"Literal": "\" does not exist" "literal": "\" does not exist"
} }
] ]
}, },
@ -95,7 +95,7 @@ expression: output
"exception": "OC\\Share20\\Exception\\ProviderException", "exception": "OC\\Share20\\Exception\\ProviderException",
"message_parts": [ "message_parts": [
{ {
"Literal": "Recipient does not match" "literal": "Recipient does not match"
} }
] ]
}, },
@ -107,7 +107,7 @@ expression: output
"exception": "OC\\Share20\\Exception\\ProviderException", "exception": "OC\\Share20\\Exception\\ProviderException",
"message_parts": [ "message_parts": [
{ {
"Literal": "Invalid shareType" "literal": "Invalid shareType"
} }
] ]
}, },
@ -119,7 +119,7 @@ expression: output
"exception": "\\Exception", "exception": "\\Exception",
"message_parts": [ "message_parts": [
{ {
"Literal": "non-shallow getSharesInFolder is no longer supported" "literal": "non-shallow getSharesInFolder is no longer supported"
} }
] ]
}, },
@ -147,7 +147,7 @@ expression: output
"exception": "OC\\Share20\\Exception\\BackendError", "exception": "OC\\Share20\\Exception\\BackendError",
"message_parts": [ "message_parts": [
{ {
"Literal": "Invalid backend" "literal": "Invalid backend"
} }
] ]
}, },
@ -175,7 +175,7 @@ expression: output
"exception": null, "exception": null,
"message_parts": [ "message_parts": [
{ {
"PlaceHolder": "$e->getMessage()" "placeholder": "$e->getMessage()"
} }
] ]
}, },
@ -187,13 +187,13 @@ expression: output
"exception": null, "exception": null,
"message_parts": [ "message_parts": [
{ {
"Literal": "Share notification not sent to " "literal": "Share notification not sent to "
}, },
{ {
"PlaceHolder": "$share->getSharedWith()" "placeholder": "$share->getSharedWith()"
}, },
{ {
"Literal": " because user could not be found." "literal": " because user could not be found."
} }
] ]
}, },
@ -205,13 +205,13 @@ expression: output
"exception": null, "exception": null,
"message_parts": [ "message_parts": [
{ {
"Literal": "Share notification not sent to " "literal": "Share notification not sent to "
}, },
{ {
"PlaceHolder": "$share->getSharedWith()" "placeholder": "$share->getSharedWith()"
}, },
{ {
"Literal": " because email address is not set." "literal": " because email address is not set."
} }
] ]
}, },
@ -223,19 +223,19 @@ expression: output
"exception": null, "exception": null,
"message_parts": [ "message_parts": [
{ {
"Literal": "Sent share notification to " "literal": "Sent share notification to "
}, },
{ {
"PlaceHolder": "$emailAddress" "placeholder": "$emailAddress"
}, },
{ {
"Literal": " for share with ID " "literal": " for share with ID "
}, },
{ {
"PlaceHolder": "$share->getId()" "placeholder": "$share->getId()"
}, },
{ {
"Literal": "." "literal": "."
} }
] ]
}, },
@ -247,7 +247,7 @@ expression: output
"exception": null, "exception": null,
"message_parts": [ "message_parts": [
{ {
"Literal": "Share notification mail could not be sent." "literal": "Share notification mail could not be sent."
} }
] ]
}, },
@ -259,10 +259,10 @@ expression: output
"exception": null, "exception": null,
"message_parts": [ "message_parts": [
{ {
"Literal": "Share notification mail could not be sent to: " "literal": "Share notification mail could not be sent to: "
}, },
{ {
"PlaceHolder": "implode(', ', $failedRecipients)" "placeholder": "implode(', ', $failedRecipients)"
} }
] ]
} }

5
nix/overlay.nix
View file

@ -1,9 +1,10 @@
final: prev: let final: prev: let
inherit (builtins) mapAttrs attrValues map; inherit (builtins) mapAttrs attrValues map tail;
inherit (prev) symlinkJoin; inherit (prev) symlinkJoin;
inherit (prev.lib) importJSON; inherit (prev.lib) importJSON;
inherit (prev.lib.lists) flatten; inherit (prev.lib.lists) flatten;
packages = prev.lib.traceValSeq (importJSON ./versions.json); allPackages = importJSON ./versions.json;
packages = {server = {"29" = allPackages.server."29";};};
loggingFor = mode: name: loggingFor = mode: name:
mapAttrs (major: data: (final.callPackage ./extracted-logs.nix { mapAttrs (major: data: (final.callPackage ./extracted-logs.nix {