Commit 692c6c4

committed

late logger needs to be boxed

1 parent 5768ce2 commit 692c6c4Copy full SHA for 692c6c4

File tree

+14

-7

lines changed

+14

-7

lines changed

Lines changed: 1 addition & 1 deletion

Lines changed: 13 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,15 +21,16 @@ pub fn output_debug_string(msg: impl AsRef<OsStr>) {`
`21`	`21`	`unsafe { OutputDebugStringW(msg_wide.as_ptr()); }`
`22`	`22`	`}`
`23`	`23`
`24`		`-static EARLY_LOGGER: EarlyLogger = EarlyLogger {};`
`25`		`-static LOGGER: PirtLogger = PirtLogger {};`
`26`		`-`
`27`		`-fn init() {`
`28`		`- log::set_logger(&EarlyLogger);`
	`24`	`+fn init() -> Result<(), String> {`
	`25`	`+ let early = EarlyLogger::new();`
	`26`	`+ log::set_boxed_logger(Box::new(early))`
	`27`	`+ .map_err(\|e\| format!("kptnhook error initializing logging: {}", e.to_string()))?;`
`29`	`28`	`}`
`30`	`29`
`31`	`30`	`struct PirtLogger;`
`32`		`-struct EarlyLogger;`
	`31`	`+struct EarlyLogger {`
	`32`	`+ level: Mutex<Level>`
	`33`	`+}`
`33`	`34`
`34`	`35`	`impl Log for PirtLogger {`
`35`	`36`	`fn enabled(&self, metadata: &log::Metadata) -> bool {`
`@@ -45,6 +46,12 @@ impl Log for PirtLogger {`
`45`	`46`	`}`
`46`	`47`	`}`
`47`	`48`
	`49`	`+impl EarlyLogger {`
	`50`	`+ pub fn new() -> Self {`
	`51`	`+ EarlyLogger { level: Mutex::new(Level::Trace) }`
	`52`	`+ }`
	`53`	`+}`
	`54`	`+`
`48`	`55`	`impl Log for EarlyLogger {`
`49`	`56`	`fn flush(&self) { }`
`50`	`57`	`fn enabled(&self, _: &log::Metadata) -> bool { true }`

Comments

(0)