From 07bf23943346f2e4299ee54059a8dc66b14aaeb9 Mon Sep 17 00:00:00 2001 From: wheaney <42350981+wheaney@users.noreply.github.com> Date: Thu, 19 Dec 2024 15:49:44 -0800 Subject: [PATCH] Adding timestamp to logging --- gnome/src/extension.js | 28 ++++++++++++++-------------- gnome/src/logger.js | 7 ++++--- gnome/src/time.js | 2 +- gnome/src/xrEffect.js | 4 ++-- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/gnome/src/extension.js b/gnome/src/extension.js index d8adda3..08c4c5d 100644 --- a/gnome/src/extension.js +++ b/gnome/src/extension.js @@ -98,13 +98,13 @@ export default class BreezyDesktopExtension extends Extension { this._cli_file = Gio.file_new_for_path(ALT_CLI_PATH); if (!this._cli_file.query_exists(null)) { this._cli_file = null; - Globals.logger.log('ERROR: BreezyDesktopExtension enable - xr_driver_cli not found'); + Globals.logger.log('[ERROR] BreezyDesktopExtension enable - xr_driver_cli not found'); } } this._setup(); } catch (e) { - Globals.logger.log(`ERROR: BreezyDesktopExtension enable ${e.message}\n${e.stack}`); + Globals.logger.log(`[ERROR] BreezyDesktopExtension enable ${e.message}\n${e.stack}`); } } @@ -133,7 +133,7 @@ export default class BreezyDesktopExtension extends Extension { return GLib.SOURCE_CONTINUE; } } catch (e) { - Globals.logger.log(`ERROR: BreezyDesktopExtension _poll_for_ready ${e.message}\n${e.stack}`); + Globals.logger.log(`[ERROR] BreezyDesktopExtension _poll_for_ready ${e.message}\n${e.stack}`); this._running_poller_id = undefined; return GLib.SOURCE_REMOVE; } @@ -170,7 +170,7 @@ export default class BreezyDesktopExtension extends Extension { Globals.logger.log_debug('BreezyDesktopExtension _find_supported_monitor - No supported monitor found'); return null; } catch (e) { - Globals.logger.log(`ERROR: BreezyDesktopExtension _find_supported_monitor ${e.message}\n${e.stack}`); + Globals.logger.log(`[ERROR] BreezyDesktopExtension _find_supported_monitor ${e.message}\n${e.stack}`); return null; } } @@ -231,7 +231,7 @@ export default class BreezyDesktopExtension extends Extension { return isValidKeepAlive(file_modified_time); } } catch (e) { - Globals.logger.log(`ERROR: BreezyDesktopExtension _check_driver_running ${e.message}\n${e.stack}`); + Globals.logger.log(`[ERROR] BreezyDesktopExtension _check_driver_running ${e.message}\n${e.stack}`); } return false; @@ -315,7 +315,7 @@ export default class BreezyDesktopExtension extends Extension { this._add_settings_keybinding('toggle-display-distance-shortcut', this._xr_effect._change_distance.bind(this._xr_effect)); this._add_settings_keybinding('toggle-follow-shortcut', this._toggle_follow_mode.bind(this)); } catch (e) { - Globals.logger.log(`ERROR: BreezyDesktopExtension _effect_enable ${e.message}\n${e.stack}`); + Globals.logger.log(`[ERROR] BreezyDesktopExtension _effect_enable ${e.message}\n${e.stack}`); this._effect_disable(); } } @@ -351,11 +351,11 @@ export default class BreezyDesktopExtension extends Extension { bind_to_function ); } catch (e) { - Globals.logger.log(`ERROR: BreezyDesktopExtension _add_settings_keybinding settings binding lambda ${e.message}\n${e.stack}`); + Globals.logger.log(`[ERROR] BreezyDesktopExtension _add_settings_keybinding settings binding lambda ${e.message}\n${e.stack}`); } }); } catch (e) { - Globals.logger.log(`ERROR: BreezyDesktopExtension _add_settings_keybinding ${e.message}\n${e.stack}`); + Globals.logger.log(`[ERROR] BreezyDesktopExtension _add_settings_keybinding ${e.message}\n${e.stack}`); } } @@ -366,7 +366,7 @@ export default class BreezyDesktopExtension extends Extension { stream.write(`${key}=${value}`, null); stream.close(null); } catch (e) { - Globals.logger.log(`ERROR: BreezyDesktopExtension _write_control ${e.message}\n${e.stack}`); + Globals.logger.log(`[ERROR] BreezyDesktopExtension _write_control ${e.message}\n${e.stack}`); } } @@ -390,7 +390,7 @@ export default class BreezyDesktopExtension extends Extension { } } } catch (e) { - Globals.logger.log(`ERROR: BreezyDesktopExtension _read_state ${e.message}\n${e.stack}`); + Globals.logger.log(`[ERROR] BreezyDesktopExtension _read_state ${e.message}\n${e.stack}`); } return state; } @@ -495,7 +495,7 @@ export default class BreezyDesktopExtension extends Extension { let [success, stdout, stderr] = proc.communicate_utf8(null, null); if (!success || !!stderr || !stdout) { - Globals.logger.log(`ERROR: Failed to get driver status: ${stderr}`); + Globals.logger.log(`[ERROR] Failed to get driver status: ${stderr}`); return; } @@ -510,7 +510,7 @@ export default class BreezyDesktopExtension extends Extension { ); [success, stdout, stderr] = proc.communicate_utf8(null, null); if (!success || !!stderr) { - Globals.logger.log(`ERROR: Failed to toggle driver: ${stderr}`); + Globals.logger.log(`[ERROR] Failed to toggle driver: ${stderr}`); } } @@ -617,7 +617,7 @@ export default class BreezyDesktopExtension extends Extension { this._write_control('sbs_mode', 'disable'); } } catch (e) { - Globals.logger.log(`ERROR: BreezyDesktopExtension _effect_disable ${e.message}\n${e.stack}`); + Globals.logger.log(`[ERROR] BreezyDesktopExtension _effect_disable ${e.message}\n${e.stack}`); } } @@ -640,7 +640,7 @@ export default class BreezyDesktopExtension extends Extension { this._monitor_manager = null; } } catch (e) { - Globals.logger.log(`ERROR: BreezyDesktopExtension disable ${e.message}\n${e.stack}`); + Globals.logger.log(`[ERROR] BreezyDesktopExtension disable ${e.message}\n${e.stack}`); } } } diff --git a/gnome/src/logger.js b/gnome/src/logger.js index 50450c1..5bdf115 100644 --- a/gnome/src/logger.js +++ b/gnome/src/logger.js @@ -96,9 +96,10 @@ export const Logger = GObject.registerClass({ } const now = GLib.DateTime.new_now_local(); + const timestamp = now.format('%Y-%m-%d %H:%M:%S.') + now.format('%f').substring(0, 3); const logFileName = `${now.format('%Y-%m-%d')}.log`; const file = Gio.File.new_for_path(`${this._log_file_dir}/${logFileName}`); - + if (!file.query_exists(null)) { const parentDir = file.get_parent(); if (!parentDir.query_exists(null)) { @@ -106,13 +107,13 @@ export const Logger = GObject.registerClass({ } } const stream = file.append_to(Gio.FileCreateFlags.NONE, null); - stream.write(`${this.title}: ${text}\n`, null); + stream.write(`${timestamp} ${text}\n`, null); stream.close(null); } log_debug(text) { if (this.debug) { - this.log(`\tDEBUG - ${text}`); + this.log(`[DEBUG] ${text}`); } } }); \ No newline at end of file diff --git a/gnome/src/time.js b/gnome/src/time.js index 017994a..8c17207 100644 --- a/gnome/src/time.js +++ b/gnome/src/time.js @@ -7,5 +7,5 @@ export function toSec(milliseconds) { } export function isValidKeepAlive(dateSec) { - return Math.abs(toSec(Date.now()) - dateSec) <= 1; + return Math.abs(getEpochSec() - dateSec) <= 1; } \ No newline at end of file diff --git a/gnome/src/xrEffect.js b/gnome/src/xrEffect.js index 8590e0f..19533f1 100644 --- a/gnome/src/xrEffect.js +++ b/gnome/src/xrEffect.js @@ -214,7 +214,7 @@ function setIntermittentUniformVariables() { throw new Error(`Invalid dataView.byteLength: ${dataView.byteLength} !== ${DATA_VIEW_LENGTH}`); } } catch (e) { - Globals.logger.log(`ERROR: xrEffect.js setIntermittentUniformVariables ${e.message}\n${e.stack}`); + Globals.logger.log(`[ERROR] xrEffect.js setIntermittentUniformVariables ${e.message}\n${e.stack}`); } } @@ -419,7 +419,7 @@ export const XREffect = GObject.registerClass({ success = true; } } else if (this._dataView.byteLength !== 0) { - Globals.logger.log(`ERROR: Invalid dataView.byteLength: ${this._dataView.byteLength} !== ${DATA_VIEW_LENGTH}`) + Globals.logger.log(`[ERROR] Invalid dataView.byteLength: ${this._dataView.byteLength} !== ${DATA_VIEW_LENGTH}`) } if (!success && ++attempts < 3) {