settings: add button to get logs

hrfee · Dec 30, 2021 · 51b59ae · 51b59ae
1 parent 8888807
commit 51b59ae
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 1 deletion.
diff --git a/api.go b/api.go
@@ -2847,6 +2847,15 @@ func (app *appContext) restart(gc *gin.Context) {
 	}
 }
 
+// @Summary Returns the last 100 lines of the log.
+// @Router /log [get]
+// @Success 200 {object} LogDTO
+// @Security Bearer
+// @tags Other
+func (app *appContext) GetLog(gc *gin.Context) {
+	gc.JSON(200, LogDTO{lineCache.String()})
+}
+
 // no need to syscall.exec anymore!
 func (app *appContext) Restart() error {
 	if TRAY {

diff --git a/html/admin.html b/html/admin.html
@@ -71,6 +71,12 @@
                 <pre class="monospace">{{ .license }}</pre>
             </div>
         </div>
+        <div id="modal-logs" class="modal">
+            <div class="modal-content wide content card">
+                <span class="heading">{{ .strings.logs }}<span class="modal-close">&times;</span></span>
+                <pre class="monospace" id="log-area"></pre>
+            </div>
+        </div>
         <div id="modal-modify-user" class="modal">
             <form class="modal-content card" id="form-modify-user" href="">
                 <span class="heading"><span id="header-modify-user"></span> <span class="modal-close">&times;</span></span>
@@ -635,6 +641,7 @@ <h1 class="ac" id="telegram-pin"></h1>
                             </label>
                         </div>
                         <div>
+                            <span class="button ~info !normal" id="settings-logs">{{ .strings.logs }}</span>
                             <span class="button ~neutral !normal" id="settings-restart">{{ .strings.settingsRestart }}</span>
                             <span class="button ~urge !normal unfocused" id="settings-save">{{ .strings.settingsSave }}</span>
                         </div>

diff --git a/lang/admin/en-us.json b/lang/admin/en-us.json
@@ -48,6 +48,7 @@
         "profile": "Profile",
         "unknown": "Unknown",
         "label": "Label",
+        "logs": "Logs",
         "announce": "Announce",
         "templates": "Templates",
         "subject": "Subject",

diff --git a/models.go b/models.go
@@ -341,3 +341,7 @@ type InternalPWR struct {
 	ID       string    `json:"id"`
 	Expiry   time.Time `json:"expiry"`
 }
+
+type LogDTO struct {
+	Log string `json:"log"`
+}
diff --git a/router.go b/router.go
@@ -180,6 +180,7 @@ func (app *appContext) loadRoutes(router *gin.Engine) {
 		api.GET(p+"/config", app.GetConfig)
 		api.POST(p+"/config", app.ModifyConfig)
 		api.POST(p+"/restart", app.restart)
+		api.GET(p+"/logs", app.GetLog)
 		if telegramEnabled || discordEnabled || matrixEnabled {
 			api.GET(p+"/telegram/pin", app.TelegramGetPin)
 			api.GET(p+"/telegram/verified/:pin", app.TelegramVerified)

diff --git a/ts/admin.ts b/ts/admin.ts
@@ -87,6 +87,8 @@ window.availableProfiles = window.availableProfiles || [];
 
     window.modals.matrix = new Modal(document.getElementById("modal-matrix"));
 
+    window.modals.logs = new Modal(document.getElementById("modal-logs"));
+
     if (window.telegramEnabled) {
         window.modals.telegram = new Modal(document.getElementById("modal-telegram"));
     }

diff --git a/ts/modules/settings.ts b/ts/modules/settings.ts
@@ -634,6 +634,13 @@ export class settingsList {
         }
     });
 
+    private _showLogs = () => _get("/logs", null, (req: XMLHttpRequest) => {
+        if (req.readyState == 4 && req.status == 200) {
+            (document.getElementById("log-area") as HTMLPreElement).textContent = req.response["log"] as string;
+            window.modals.logs.show();
+        }
+    });
+
     constructor() {
         this._sections = {};
         this._buttons = {};
@@ -645,7 +652,7 @@ export class settingsList {
         };
         this._saveButton.onclick = this._save;
         document.addEventListener("settings-requires-restart", () => { this._needsRestart = true; });
-
+        document.getElementById("settings-logs").onclick = this._showLogs;
         const advancedEnableToggle = document.getElementById("settings-advanced-enabled") as HTMLInputElement;
         advancedEnableToggle.onchange = () => {
             document.dispatchEvent(new CustomEvent("settings-advancedState", { detail: advancedEnableToggle.checked }));

diff --git a/ts/typings/d.ts b/ts/typings/d.ts
@@ -107,6 +107,7 @@ declare interface Modals {
     discord: Modal;
     matrix: Modal;
     sendPWR?: Modal;
+    logs: Modal;
 }
 
 interface Invite {