From c165b97d578b286f16170ee02cb78bb05ab7ee2a Mon Sep 17 00:00:00 2001
From: Lea Anthony <lea.anthony@gmail.com>
Date: Mon, 12 Oct 2020 06:56:51 +1100
Subject: [PATCH] SetLogLevel fully supported

---
 .../frontend/src/pages/logging/Log/Log.svelte |  6 +----
 .../frontend/src/pages/logging/Logging.svelte | 24 ++++++++++++-------
 .../logging/SetLogLevel/SetLogLevel.svelte    | 20 ++++++++++++----
 3 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/v2/test/kitchensink/frontend/src/pages/logging/Log/Log.svelte b/v2/test/kitchensink/frontend/src/pages/logging/Log/Log.svelte
index 6b84166af..35b8fbdd9 100644
--- a/v2/test/kitchensink/frontend/src/pages/logging/Log/Log.svelte
+++ b/v2/test/kitchensink/frontend/src/pages/logging/Log/Log.svelte
@@ -16,10 +16,6 @@
 
     var id = "Logging";
 
-    $: () => {
-        console.log("Loglevel:", $logLevel)
-    }
-
     function sendLogMessage() {
         if( message.length > 0 ) {
             if( isJs ) {
@@ -55,7 +51,7 @@
                 <input type="text" class="form-control" id="{id}-message" placeholder="Hello World!" bind:value="{message}" required="required">
             </div>
 
-            <input class="btn btn-primary" type="button" on:click="{sendLogMessage}" value="Call {lang} method">
+            <input class="btn btn-primary" type="button" on:click="{sendLogMessage}" value="Log using {lang} runtime">
         </form>
     </div>
 </CodeBlock>
diff --git a/v2/test/kitchensink/frontend/src/pages/logging/Logging.svelte b/v2/test/kitchensink/frontend/src/pages/logging/Logging.svelte
index 2720ee16e..ba7d38624 100644
--- a/v2/test/kitchensink/frontend/src/pages/logging/Logging.svelte
+++ b/v2/test/kitchensink/frontend/src/pages/logging/Logging.svelte
@@ -1,4 +1,6 @@
 <script>
+    import FakeTerm from '../../components/FakeTerm.svelte';
+    import Link from '../../components/Link.svelte';
     import Log from './Log/Log.svelte';
     import SetLogLevel from './SetLogLevel/SetLogLevel.svelte';
     
@@ -8,23 +10,29 @@
 <div>
     <h4>Logging</h4>
 
-    Logging is part of the Wails Runtime and is accessed through the <code>runtime.Log</code> object. There are {loglevels.length} methods available:
+    Logging is part of the Wails Runtime and is accessed through the <code>runtime.Log</code> object. 
     
-    <ul class="list">
+    There are {loglevels.length} methods available:
+    
+    <ol class="list">
         {#each loglevels as option}
         <li>{option}</li>
         {/each}
-    </ul>
+    </ol>
     <br/>
 
-    The default logger will log all messages to the console EG:<br/>
-    <pre>
+    Logs are only output if they are above or equal to the current log level. Example: If the current log level is 
+    <code>Info</code>, then <code>Trace</code> and <code>Debug</code> messages will be surpressed. <br/>
+    <code>Fatal</code> will log the message and then immediately exit the program.<br/>
+    <code>Print</code> will send a raw message to the log. You can use <code>Print</code> at any log level.<br/>
+    
+    The default logger will log messages to the console in the following format:<br/>
+    <FakeTerm>
 INFO  | I am an Info message
 ERROR | I am an Error message
 WARN  | I am a Warning message
-    </pre>
-
-    <code>Fatal</code> will print the message and then immediately exit the program.
+    </FakeTerm>
+    Custom loggers may be given to your Wails application. More details <Link href="https://www.google.com">here</Link>.
     
     <div style="padding: 15px"></div>
     
diff --git a/v2/test/kitchensink/frontend/src/pages/logging/SetLogLevel/SetLogLevel.svelte b/v2/test/kitchensink/frontend/src/pages/logging/SetLogLevel/SetLogLevel.svelte
index 912ea34b3..7fe4a2b17 100644
--- a/v2/test/kitchensink/frontend/src/pages/logging/SetLogLevel/SetLogLevel.svelte
+++ b/v2/test/kitchensink/frontend/src/pages/logging/SetLogLevel/SetLogLevel.svelte
@@ -2,19 +2,30 @@
     import CodeBlock from '../../../components/CodeBlock.svelte';
     import { logLevel } from '../../../Store';
 
+    import { Log } from '@wails/runtime';
+
     import jsCode from './code.jsx';
     import goCode from './code.go';
 
     var options = ["Trace", "Debug", "Info", "Warning", "Error"];
-
+    let isJs = false;
     var id = "SetLogLevel";
     let loglevelText = options[$logLevel];
 
-    $: logLevel.set(options.indexOf(loglevelText));
-    
+    $: setLogLevelMethod = isJs ? Log.SetLogLevel : backend.main.Logger.SetLogLevel;
+
+    function setLogLevel() {
+        let logLevelUpper = loglevelText.toUpperCase();
+        let logLevelNumber = Log.Level[logLevelUpper];
+        setLogLevelMethod(logLevelNumber);
+    };
+    $: lang = isJs ? 'Javascript' : 'Go';
+
+    let description = `You can set the log level using Log.SetLogLevel(). It accepts a log level (number) but the log levels supported have been added to Log: Log.TRACE
+`;    
 </script>
 
-<CodeBlock {jsCode} {goCode} title="SetLogLevel" {id}>
+<CodeBlock bind:isJs={isJs} {jsCode} {goCode} title="SetLogLevel" {id} {description}>
     <div class="logging-form">
         <form data-wails-no-drag class="w-500 mw-full">
             <!-- Radio -->
@@ -27,6 +38,7 @@
                 </div>   
                 {/each}
             </div>
+            <input class="btn btn-primary" type="button" on:click="{setLogLevel}" value="SetLogLevel using {lang} runtime">
         </form>
     </div>
 </CodeBlock>
\ No newline at end of file