From 0d0dee9249a0c66f7ac5e922e9d4fb7adcf7c2ac Mon Sep 17 00:00:00 2001
From: George Shaw <george.e.shaw.iv@outlook.com>
Date: Thu, 9 Nov 2017 16:51:02 -0600
Subject: [PATCH 1/5] wrote file logging test and implimented the correct logs
 for alpha phase

---
 document_roots/webhost/assets/css/style.css   |  6 ++
 document_roots/webhost/gPanel.html            | 14 ++++
 logs/{private/error.log => client_errors.log} |  0
 logs/{private/warning.log => loadtime.log}    |  0
 logs/public/warning.log                       |  0
 logs/{public/error.log => server_errors.log}  |  0
 pkg/logging/file.go                           | 65 ++++++++++---------
 pkg/logging/file_test.go                      | 29 +++++++++
 8 files changed, 85 insertions(+), 29 deletions(-)
 rename logs/{private/error.log => client_errors.log} (100%)
 rename logs/{private/warning.log => loadtime.log} (100%)
 delete mode 100644 logs/public/warning.log
 rename logs/{public/error.log => server_errors.log} (100%)
 create mode 100644 pkg/logging/file_test.go

diff --git a/document_roots/webhost/assets/css/style.css b/document_roots/webhost/assets/css/style.css
index f653b57..e9b2c0a 100644
--- a/document_roots/webhost/assets/css/style.css
+++ b/document_roots/webhost/assets/css/style.css
@@ -27,3 +27,9 @@ body {
   cursor:pointer;
 }
 /* Navbar End */
+
+/* General Start */
+.btn {
+  cursor:pointer;
+}
+/* General End */
diff --git a/document_roots/webhost/gPanel.html b/document_roots/webhost/gPanel.html
index d938ccc..b6638ac 100644
--- a/document_roots/webhost/gPanel.html
+++ b/document_roots/webhost/gPanel.html
@@ -47,6 +47,20 @@
           </div>
         </div>
       </div>
+
+      <div class="row mt-5">
+        <div class="col-12">
+          <div class="card">
+            <div class="card-body">
+              <h4 class="card-title">Diagnostics</h4>
+              <h6 class="card-subtitle mb-4 text-muted">View various server data pools that may help pinpoint issues</h6>
+              <button type="button" class="btn btn-outline-primary">4xx Error Log</button>
+              <button type="button" class="btn btn-outline-primary">5xx Error Log</button>
+              <button type="button" class="btn btn-outline-primary">Load Time Log</button>
+            </div>
+          </div>
+        </div>
+      </div>
     </div>
 
     <footer class="sticky-footer">
diff --git a/logs/private/error.log b/logs/client_errors.log
similarity index 100%
rename from logs/private/error.log
rename to logs/client_errors.log
diff --git a/logs/private/warning.log b/logs/loadtime.log
similarity index 100%
rename from logs/private/warning.log
rename to logs/loadtime.log
diff --git a/logs/public/warning.log b/logs/public/warning.log
deleted file mode 100644
index e69de29..0000000
diff --git a/logs/public/error.log b/logs/server_errors.log
similarity index 100%
rename from logs/public/error.log
rename to logs/server_errors.log
diff --git a/pkg/logging/file.go b/pkg/logging/file.go
index 0c8b556..f73526e 100644
--- a/pkg/logging/file.go
+++ b/pkg/logging/file.go
@@ -1,40 +1,47 @@
 // Package logging handles the various mediums and logic of logging messages and reports.
 package logging
 
-import "os"
-
-const (
-	PRIVATE_LOG_FOLDER = "logs/private/"
-	PUBLIC_LOG_FOLDER  = "logs/public/"
-
-	ERROR   = "error.log"
-	WARNING = "warning.log"
+import (
+	"os"
+	"path/filepath"
 )
 
-// File logs a given message to a log file
-func File(logFolder string, logFile string, msg string) (string, error) {
-	msg += "\n"
+const (
+	LOG_CLIENT_ERRORS = "client_errors.log"
+	LOG_SERVER_ERRORS = "server_errors.log"
+	LOG_LOADTIME      = "loadtime.log"
+)
 
-	f, err := os.OpenFile(logFolder+logFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+// File logs a given message to a log file. The logFile parameter is relative
+// to the logs directory. The parameter delete will delete the file after
+// writing to it if set to true (primarily used to help write tests).
+func File(logFile string, msg string, delete bool) (int, error) {
+	msg = msg + "\n"
 
+	absPath, err := filepath.Abs("../../logs/" + logFile)
 	if err != nil {
-		return "", err
-	} else {
-		writtenBytes, err := f.Write([]byte(msg))
-
-		if err != nil {
-			return string(writtenBytes), err
-		} else {
-			err := f.Close()
-
-			if err != nil {
-				return string(writtenBytes), err
-			} else {
-				return string(writtenBytes), nil
-			}
-
-		}
-
+		return 0, err
 	}
 
+	f, err := os.OpenFile(absPath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+
+	if err != nil {
+		return 0, err
+	}
+	writtenBytes, err := f.Write([]byte(msg))
+
+	if err != nil {
+		return writtenBytes, err
+	}
+	err = f.Close()
+
+	if err != nil {
+		return writtenBytes, err
+	}
+
+	if delete {
+		os.Remove(absPath)
+	}
+
+	return writtenBytes, nil
 }
diff --git a/pkg/logging/file_test.go b/pkg/logging/file_test.go
new file mode 100644
index 0000000..63728f4
--- /dev/null
+++ b/pkg/logging/file_test.go
@@ -0,0 +1,29 @@
+// Package logging handles the various mediums and logic of logging messages and reports.
+package logging
+
+import (
+	"testing"
+)
+
+func TestFile(t *testing.T) {
+	testData := []struct {
+		File    string
+		Message string
+	}{
+		{"testfile.log", "testtest123"},
+		{"testfile.log", "123:432:abc12"},
+	}
+
+	for _, data := range testData {
+		written, err := File(data.File, data.Message, true)
+
+		if err != nil {
+			t.Errorf("File function in package logging threw an error: %v", err.Error())
+		}
+
+		wanted := len([]byte(data.Message + "\n"))
+		if written != wanted {
+			t.Errorf("File function did not write correct number of bytes in file.\nWanted: %d\nGot: %d", wanted, written)
+		}
+	}
+}

From 60d2526271f7a381dcfed7aa051bc8b5605a50b1 Mon Sep 17 00:00:00 2001
From: George Shaw <george.e.shaw.iv@outlook.com>
Date: Thu, 9 Nov 2017 16:53:24 -0600
Subject: [PATCH 2/5] referencing issue #67, credit to jacob walker!

---
 pkg/public/public.go | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkg/public/public.go b/pkg/public/public.go
index d7b4fb3..43ae8c4 100644
--- a/pkg/public/public.go
+++ b/pkg/public/public.go
@@ -60,18 +60,14 @@ func (con *Controller) Stop(graceful bool) error {
 		defer cancel()
 
 		err := server.Shutdown(context)
-		if err != nil {
-			fmt.Printf("Graceful shutdown failed attempting forced: %v\n", err)
-
-			err = server.Close()
-			if err != nil {
-				return err
-			}
+		if err == nil {
+			return nil
 		}
+
+		fmt.Printf("Graceful shutdown failed attempting forced: %v\n", err)
 	}
 
-	err := server.Close()
-	if err != nil {
+	if err := server.Close(); err != nil {
 		return err
 	}
 

From e1d33d5b7d95d0a9a6f50f9d286ccf32faa9a707 Mon Sep 17 00:00:00 2001
From: George Shaw <george.e.shaw.iv@outlook.com>
Date: Fri, 10 Nov 2017 14:59:15 -0600
Subject: [PATCH 3/5] setting up reading logs and some other various file
 operations

---
 .gitignore                                    |  8 +-
 .../js/panelHandlers/diagnostics/viewLog.js   | 56 ++++++++++++
 document_roots/webhost/gPanel.html            | 28 +++++-
 logs/README.md                                |  8 ++
 logs/client_errors.log                        |  0
 logs/loadtime.log                             |  0
 logs/server_errors.log                        |  0
 pkg/api/api_handler.go                        |  3 +
 pkg/api/logs/delete.go                        | 26 ++++++
 pkg/api/logs/read.go                          | 57 ++++++++++++
 pkg/api/server/shutdown.go                    |  4 +-
 pkg/file/file.go                              | 86 +++++++++++++++++++
 pkg/logging/console.go                        | 34 --------
 pkg/logging/file.go                           | 47 ----------
 pkg/logging/file_test.go                      | 29 -------
 pkg/public/public.go                          |  4 -
 pkg/webhost/webhost.go                        |  4 -
 17 files changed, 269 insertions(+), 125 deletions(-)
 create mode 100644 document_roots/webhost/assets/js/panelHandlers/diagnostics/viewLog.js
 create mode 100644 logs/README.md
 delete mode 100644 logs/client_errors.log
 delete mode 100644 logs/loadtime.log
 delete mode 100644 logs/server_errors.log
 create mode 100644 pkg/api/logs/delete.go
 create mode 100644 pkg/api/logs/read.go
 create mode 100644 pkg/file/file.go
 delete mode 100644 pkg/logging/console.go
 delete mode 100644 pkg/logging/file.go
 delete mode 100644 pkg/logging/file_test.go

diff --git a/.gitignore b/.gitignore
index 496a1e0..c5dab9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,11 @@
+# Ignore executables generated
 main
-
 gpanel
 
+# Ignore database files
 datastore.db
+datastore.db.lock
 
-datastore.db.lock
\ No newline at end of file
+# Ignore log files
+logs/*
+!logs/README.md
diff --git a/document_roots/webhost/assets/js/panelHandlers/diagnostics/viewLog.js b/document_roots/webhost/assets/js/panelHandlers/diagnostics/viewLog.js
new file mode 100644
index 0000000..c8bd50e
--- /dev/null
+++ b/document_roots/webhost/assets/js/panelHandlers/diagnostics/viewLog.js
@@ -0,0 +1,56 @@
+var logModal = jQuery('.view-log-modal');
+
+jQuery('._js_diagnostics-view-log').on('click', function(e){
+  e.preventDefault();
+
+  var logName = jQuery(this).attr('data');
+
+  var title;
+  switch(logName) {
+    case "client_errors":
+      title = "Client Error Log (4xx)"
+      break;
+    case "server_errors":
+      title = "Server Error Log (5xx)"
+      break;
+    case "load_time":
+      title = "Load Time Log"
+      break;
+    default:
+      return;
+      break;
+  }
+  jQuery(logModal).find('.modal-title').html(title);
+
+  var requestData = {};
+  requestData["name"] = logName+".log";
+
+  var xhr = new XMLHttpRequest();
+  xhr.open('POST', 'api/logs/read', true);
+  xhr.send(JSON.stringify(requestData));
+
+  xhr.onloadend = function() {
+    if(xhr.status == 200) {
+      var responseData;
+
+      if(xhr.response != undefined && xhr.response.length != 0) {
+        responseData = xhr.response;
+      }
+      else {
+        responseData = "The log is currently empty."
+      }
+
+      jQuery(logModal).find('.modal-body textarea').html(responseData);
+      jQuery(logModal).modal('show');
+    }
+    else {
+      if(xhr.response) {
+        alert(xhr.response);
+      }
+      else {
+        alert('An error has occurred, please contact your webhost administrator.');
+      }
+    }
+  }
+
+});
diff --git a/document_roots/webhost/gPanel.html b/document_roots/webhost/gPanel.html
index b6638ac..489963d 100644
--- a/document_roots/webhost/gPanel.html
+++ b/document_roots/webhost/gPanel.html
@@ -27,6 +27,26 @@
       </div>
     </nav>
 
+    <div class="modal fade view-log-modal" tabindex="-1" role="dialog" aria-labelledby="view-log-modal" aria-hidden="true">
+      <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h5 class="modal-title"></h5>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+              <span aria-hidden="true">&times;</span>
+            </button>
+          </div>
+          <div class="modal-body">
+            <textarea class="w-100 h-100" readonly></textarea>
+          </div>
+          <div class="modal-footer">
+            <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+            <button type="button" class="btn btn-danger">Clear Log</button>
+          </div>
+        </div>
+      </div>
+    </div>
+
     <div class="container">
       <div class="row">
         <div class="col-12">
@@ -54,9 +74,9 @@
             <div class="card-body">
               <h4 class="card-title">Diagnostics</h4>
               <h6 class="card-subtitle mb-4 text-muted">View various server data pools that may help pinpoint issues</h6>
-              <button type="button" class="btn btn-outline-primary">4xx Error Log</button>
-              <button type="button" class="btn btn-outline-primary">5xx Error Log</button>
-              <button type="button" class="btn btn-outline-primary">Load Time Log</button>
+              <button type="button" class="btn btn-outline-primary _js_diagnostics-view-log" data="client_errors">Client Error Log</button>
+              <button type="button" class="btn btn-outline-primary _js_diagnostics-view-log" data="server_errors">Server Error Log</button>
+              <button type="button" class="btn btn-outline-primary _js_diagnostics-view-log" data="load_time">Load Time Log</button>
             </div>
           </div>
         </div>
@@ -89,6 +109,8 @@
     <script type="text/javascript" src="assets/js/panelHandlers/publicServer/start.js"></script>
     <script type="text/javascript" src="assets/js/panelHandlers/publicServer/shutdown.js"></script>
     <script type="text/javascript" src="assets/js/panelHandlers/publicServer/restart.js"></script>
+
+    <script type="text/javascript" src="assets/js/panelHandlers/diagnostics/viewLog.js"></script>
     <!-- KEEP AT BOTTOM OF BODY TAGS -->
   </body>
 </html>
diff --git a/logs/README.md b/logs/README.md
new file mode 100644
index 0000000..bc23fc2
--- /dev/null
+++ b/logs/README.md
@@ -0,0 +1,8 @@
+# gPanel Logs
+
+The actual log files are ignored by the .gitignore file. They are generated automatically upon being needed within the software itself.
+
+Current log files:  
+- client_errors.log
+- server_errors.log
+- loadtime.log
diff --git a/logs/client_errors.log b/logs/client_errors.log
deleted file mode 100644
index e69de29..0000000
diff --git a/logs/loadtime.log b/logs/loadtime.log
deleted file mode 100644
index e69de29..0000000
diff --git a/logs/server_errors.log b/logs/server_errors.log
deleted file mode 100644
index e69de29..0000000
diff --git a/pkg/api/api_handler.go b/pkg/api/api_handler.go
index 7ad8146..a7c19f2 100644
--- a/pkg/api/api_handler.go
+++ b/pkg/api/api_handler.go
@@ -5,6 +5,7 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/Ennovar/gPanel/pkg/api/logs"
 	"github.com/Ennovar/gPanel/pkg/api/server"
 	"github.com/Ennovar/gPanel/pkg/api/user"
 	"github.com/Ennovar/gPanel/pkg/public"
@@ -39,6 +40,8 @@ func HandleAPI(res http.ResponseWriter, req *http.Request, path string, publicSe
 		return true, server.Restart(res, req, publicServer)
 	case "/server/maintenance":
 		return true, server.Maintenance(res, req, publicServer)
+	case "/logs/read":
+		return true, logs.Read(res, req)
 	default:
 		return false, false
 	}
diff --git a/pkg/api/logs/delete.go b/pkg/api/logs/delete.go
new file mode 100644
index 0000000..d342f98
--- /dev/null
+++ b/pkg/api/logs/delete.go
@@ -0,0 +1,26 @@
+// Package logs is a child of package api to handle api calls concerning log files
+package logs
+
+import (
+	"encoding/json"
+	"net/http"
+)
+
+func Delete(res http.ResponseWriter, req *http.Request) bool {
+	if req.Method != "GET" {
+		http.Error(res, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed)
+		return false
+	}
+
+	var deleteLogRequestData struct {
+		Name string `json:"name"`
+	}
+
+	err := json.NewDecoder(req.Body).Decode(&deleteLogRequestData)
+	if err != nil {
+		http.Error(res, err.Error(), http.StatusBadRequest)
+		return false
+	}
+
+	return true
+}
diff --git a/pkg/api/logs/read.go b/pkg/api/logs/read.go
new file mode 100644
index 0000000..70e4095
--- /dev/null
+++ b/pkg/api/logs/read.go
@@ -0,0 +1,57 @@
+// Package logs is a child of package api to handle api calls concerning log files
+package logs
+
+import (
+	"encoding/json"
+	"net/http"
+
+	"github.com/Ennovar/gPanel/pkg/file"
+)
+
+func Read(res http.ResponseWriter, req *http.Request) bool {
+	if req.Method != "POST" {
+		http.Error(res, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed)
+		return false
+	}
+
+	var readLogRequestData struct {
+		Name string `json:"name"`
+	}
+
+	err := json.NewDecoder(req.Body).Decode(&readLogRequestData)
+	if err != nil {
+		http.Error(res, "0:"+err.Error(), http.StatusBadRequest)
+		return false
+	}
+
+	valid := false
+	for _, log := range file.KNOWN_LOGS {
+		if log == readLogRequestData.Name {
+			valid = true
+			break
+		}
+	}
+
+	if !valid {
+		http.Error(res, "Attempting to read from an unknown log file.", http.StatusBadRequest)
+		return false
+	}
+
+	handle, err := file.Open(readLogRequestData.Name, true, true)
+	if err != nil {
+		http.Error(res, "1:"+err.Error(), http.StatusBadRequest)
+		return false
+	}
+	defer handle.Close(false)
+
+	data, err := handle.Read()
+	if err != nil {
+		http.Error(res, "2:"+err.Error(), http.StatusBadRequest)
+		return false
+	}
+
+	res.WriteHeader(http.StatusOK)
+	res.Write(data)
+
+	return true
+}
diff --git a/pkg/api/server/shutdown.go b/pkg/api/server/shutdown.go
index 178b91d..a14b880 100644
--- a/pkg/api/server/shutdown.go
+++ b/pkg/api/server/shutdown.go
@@ -15,7 +15,7 @@ func Shutdown(res http.ResponseWriter, req *http.Request, publicServer *public.C
 	}
 
 	var shutdownRequestData struct {
-		graceful bool `json:"graceful"`
+		Graceful bool `json:"graceful"`
 	}
 
 	err := json.NewDecoder(req.Body).Decode(&shutdownRequestData)
@@ -24,7 +24,7 @@ func Shutdown(res http.ResponseWriter, req *http.Request, publicServer *public.C
 		return false
 	}
 
-	err = publicServer.Stop(shutdownRequestData.graceful)
+	err = publicServer.Stop(shutdownRequestData.Graceful)
 	if err != nil {
 		http.Error(res, err.Error(), http.StatusBadRequest)
 		return false
diff --git a/pkg/file/file.go b/pkg/file/file.go
new file mode 100644
index 0000000..d10b077
--- /dev/null
+++ b/pkg/file/file.go
@@ -0,0 +1,86 @@
+// Package file handles various file operations
+package file
+
+import (
+	"io/ioutil"
+	"os"
+	"path/filepath"
+)
+
+const (
+	LOG_CLIENT_ERRORS = "client_errors.log"
+	LOG_SERVER_ERRORS = "server_errors.log"
+	LOG_LOADTIME      = "load_time.log"
+)
+
+var KNOWN_LOGS = [...]string{LOG_CLIENT_ERRORS, LOG_SERVER_ERRORS, LOG_LOADTIME}
+
+type handler struct {
+	fileHandle *os.File
+	path       string
+}
+
+func Open(file string, append bool, log bool) (*handler, error) {
+	var err error
+	var absPath string
+	var f *os.File
+
+	// Generate file path
+	if log {
+		absPath, err = filepath.Abs("logs/" + file)
+	} else {
+		absPath, err = filepath.Abs(file)
+	}
+
+	// Handle file path errors
+	if err != nil {
+		return nil, err
+	}
+
+	// Open file
+	if append {
+		f, err = os.OpenFile(absPath, os.O_APPEND|os.O_CREATE|os.O_RDWR, 0644)
+	} else {
+		f, err = os.OpenFile(absPath, os.O_TRUNC|os.O_CREATE|os.O_RDWR, 0644)
+	}
+
+	//Handle open file errors
+	if err != nil {
+		return nil, err
+	}
+
+	// Upon success, return the handler
+	return &handler{
+		fileHandle: f,
+		path:       absPath,
+	}, nil
+}
+
+func (h *handler) Read() ([]byte, error) {
+	data, err := ioutil.ReadAll(h.fileHandle)
+	if err != nil {
+		return nil, err
+	}
+
+	return data, err
+}
+
+func (h *handler) Write(data string) (int, error) {
+	written, err := h.fileHandle.Write([]byte(data))
+	if err != nil {
+		return 0, err
+	}
+
+	return written, err
+}
+
+func (h *handler) Close(delete bool) (error, error) {
+	closeErr := h.fileHandle.Close()
+
+	if delete {
+		deleteErr := os.Remove(h.path)
+		return closeErr, deleteErr
+	}
+
+	return closeErr, nil
+}
diff --git a/pkg/logging/console.go b/pkg/logging/console.go
deleted file mode 100644
index 193660f..0000000
--- a/pkg/logging/console.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Package logging handles the various mediums and logic of logging messages and reports.
-package logging
-
-import (
-	"log"
-	"strings"
-
-	"github.com/Ennovar/gPanel/pkg/networking"
-)
-
-const (
-	PRIVATE_PREFIX = "PRIVATE::"
-	PUBLIC_PREFIX  = "PUBLIC::"
-
-	NORMAL_LOG = 1
-	FATAL_LOG  = 2
-)
-
-// Console logs a prefix, IP, and message all appeneded together to the console.
-func Console(prefix string, logType int, msg string) {
-	rawClientIP, _ := networking.GetClientIP()
-	clientIP := strings.TrimSpace(string(rawClientIP))
-
-	msg = prefix + clientIP + "::" + msg
-
-	switch logType {
-	default:
-		fallthrough
-	case 1:
-		log.Println(msg)
-	case 2:
-		log.Fatal(msg)
-	}
-}
diff --git a/pkg/logging/file.go b/pkg/logging/file.go
deleted file mode 100644
index f73526e..0000000
--- a/pkg/logging/file.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// Package logging handles the various mediums and logic of logging messages and reports.
-package logging
-
-import (
-	"os"
-	"path/filepath"
-)
-
-const (
-	LOG_CLIENT_ERRORS = "client_errors.log"
-	LOG_SERVER_ERRORS = "server_errors.log"
-	LOG_LOADTIME      = "loadtime.log"
-)
-
-// File logs a given message to a log file. The logFile parameter is relative
-// to the logs directory. The parameter delete will delete the file after
-// writing to it if set to true (primarily used to help write tests).
-func File(logFile string, msg string, delete bool) (int, error) {
-	msg = msg + "\n"
-
-	absPath, err := filepath.Abs("../../logs/" + logFile)
-	if err != nil {
-		return 0, err
-	}
-
-	f, err := os.OpenFile(absPath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
-
-	if err != nil {
-		return 0, err
-	}
-	writtenBytes, err := f.Write([]byte(msg))
-
-	if err != nil {
-		return writtenBytes, err
-	}
-	err = f.Close()
-
-	if err != nil {
-		return writtenBytes, err
-	}
-
-	if delete {
-		os.Remove(absPath)
-	}
-
-	return writtenBytes, nil
-}
diff --git a/pkg/logging/file_test.go b/pkg/logging/file_test.go
deleted file mode 100644
index 63728f4..0000000
--- a/pkg/logging/file_test.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Package logging handles the various mediums and logic of logging messages and reports.
-package logging
-
-import (
-	"testing"
-)
-
-func TestFile(t *testing.T) {
-	testData := []struct {
-		File    string
-		Message string
-	}{
-		{"testfile.log", "testtest123"},
-		{"testfile.log", "123:432:abc12"},
-	}
-
-	for _, data := range testData {
-		written, err := File(data.File, data.Message, true)
-
-		if err != nil {
-			t.Errorf("File function in package logging threw an error: %v", err.Error())
-		}
-
-		wanted := len([]byte(data.Message + "\n"))
-		if written != wanted {
-			t.Errorf("File function did not write correct number of bytes in file.\nWanted: %d\nGot: %d", wanted, written)
-		}
-	}
-}
diff --git a/pkg/public/public.go b/pkg/public/public.go
index 43ae8c4..577339c 100644
--- a/pkg/public/public.go
+++ b/pkg/public/public.go
@@ -10,7 +10,6 @@ import (
 	"os"
 	"time"
 
-	"github.com/Ennovar/gPanel/pkg/logging"
 	"github.com/Ennovar/gPanel/pkg/routing"
 )
 
@@ -137,7 +136,6 @@ func (con *Controller) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 
 	if err != nil {
 		routing.HttpThrowStatus(http.StatusNotFound, res)
-		logging.Console(logging.PUBLIC_PREFIX, logging.NORMAL_LOG, "Path \""+path+"\" rendered a 404 error.")
 		return
 	}
 
@@ -145,7 +143,6 @@ func (con *Controller) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 
 	if err != nil {
 		routing.HttpThrowStatus(http.StatusUnsupportedMediaType, res)
-		logging.Console(logging.PUBLIC_PREFIX, logging.NORMAL_LOG, "Path \""+path+"\" content type could not be determined, 404 error.")
 		return
 	}
 
@@ -154,7 +151,6 @@ func (con *Controller) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 
 	if err != nil {
 		routing.HttpThrowStatus(http.StatusInternalServerError, res)
-		logging.Console(logging.PUBLIC_PREFIX, logging.NORMAL_LOG, "Path \""+path+"\" rendered a 500 error.")
 		return
 	}
 }
diff --git a/pkg/webhost/webhost.go b/pkg/webhost/webhost.go
index 32f001c..78c6513 100644
--- a/pkg/webhost/webhost.go
+++ b/pkg/webhost/webhost.go
@@ -7,7 +7,6 @@ import (
 	"os"
 
 	"github.com/Ennovar/gPanel/pkg/api"
-	"github.com/Ennovar/gPanel/pkg/logging"
 	"github.com/Ennovar/gPanel/pkg/public"
 	"github.com/Ennovar/gPanel/pkg/routing"
 )
@@ -53,7 +52,6 @@ func (con *Controller) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 
 	if err != nil {
 		routing.HttpThrowStatus(http.StatusNotFound, res)
-		logging.Console(logging.PRIVATE_PREFIX, logging.NORMAL_LOG, "Path \""+path+"\" rendered a 404 error.")
 		return
 	}
 
@@ -61,7 +59,6 @@ func (con *Controller) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 
 	if err != nil {
 		routing.HttpThrowStatus(http.StatusUnsupportedMediaType, res)
-		logging.Console(logging.PUBLIC_PREFIX, logging.NORMAL_LOG, "Path \""+path+"\" content type could not be determined, 404 error.")
 		return
 	}
 
@@ -70,7 +67,6 @@ func (con *Controller) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 
 	if err != nil {
 		routing.HttpThrowStatus(http.StatusInternalServerError, res)
-		logging.Console(logging.PUBLIC_PREFIX, logging.NORMAL_LOG, "Path \""+path+"\" rendered a 500 error.")
 		return
 	}
 }

From f5f2ff0f5460cbf441b861e50cf31c8c1615514f Mon Sep 17 00:00:00 2001
From: George Shaw <george.e.shaw.iv@outlook.com>
Date: Fri, 10 Nov 2017 15:36:23 -0600
Subject: [PATCH 4/5] added capability to write to logs

---
 pkg/file/file.go       | 14 +++++++-------
 pkg/public/public.go   | 20 ++++++++++++++++++++
 pkg/webhost/webhost.go | 18 ++++++++++++++----
 3 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/pkg/file/file.go b/pkg/file/file.go
index d10b077..99ff357 100644
--- a/pkg/file/file.go
+++ b/pkg/file/file.go
@@ -15,12 +15,12 @@ const (
 
 var KNOWN_LOGS = [...]string{LOG_CLIENT_ERRORS, LOG_SERVER_ERRORS, LOG_LOADTIME}
 
-type handler struct {
+type Handler struct {
 	fileHandle *os.File
 	path       string
 }
 
-func Open(file string, append bool, log bool) (*handler, error) {
+func Open(file string, append bool, log bool) (*Handler, error) {
 	var err error
 	var absPath string
 	var f *os.File
@@ -50,13 +50,13 @@ func Open(file string, append bool, log bool) (*handler, error) {
 	}
 
 	// Upon success, return the handler
-	return &handler{
+	return &Handler{
 		fileHandle: f,
 		path:       absPath,
 	}, nil
 }
 
-func (h *handler) Read() ([]byte, error) {
+func (h *Handler) Read() ([]byte, error) {
 	data, err := ioutil.ReadAll(h.fileHandle)
 	if err != nil {
 		return nil, err
@@ -65,8 +65,8 @@ func (h *handler) Read() ([]byte, error) {
 	return data, err
 }
 
-func (h *handler) Write(data string) (int, error) {
-	written, err := h.fileHandle.Write([]byte(data))
+func (h *Handler) Write(data string) (int, error) {
+	written, err := h.fileHandle.Write([]byte(data + "\n"))
 	if err != nil {
 		return 0, err
 	}
@@ -74,7 +74,7 @@ func (h *handler) Write(data string) (int, error) {
 	return written, err
 }
 
-func (h *handler) Close(delete bool) (error, error) {
+func (h *Handler) Close(delete bool) (error, error) {
 	closeErr := h.fileHandle.Close()
 
 	if delete {
diff --git a/pkg/public/public.go b/pkg/public/public.go
index 577339c..06450cd 100644
--- a/pkg/public/public.go
+++ b/pkg/public/public.go
@@ -8,8 +8,10 @@ import (
 	"io"
 	"net/http"
 	"os"
+	"strconv"
 	"time"
 
+	"github.com/Ennovar/gPanel/pkg/file"
 	"github.com/Ennovar/gPanel/pkg/routing"
 )
 
@@ -17,6 +19,9 @@ type Controller struct {
 	Directory               string
 	GracefulShutdownTimeout time.Duration
 	Status                  int
+	ClientLogger            *file.Handler
+	ServerLogger            *file.Handler
+	LoadTimeLogger          *file.Handler
 }
 
 var controller Controller
@@ -24,10 +29,17 @@ var server http.Server
 
 // New function returns a new PublicWeb type.
 func New() *Controller {
+	clientLogHandler, _ := file.Open(file.LOG_CLIENT_ERRORS, true, true)
+	serverLogHandler, _ := file.Open(file.LOG_CLIENT_ERRORS, true, true)
+	loadLogHandler, _ := file.Open(file.LOG_LOADTIME, true, true)
+
 	controller = Controller{
 		Directory:               "document_roots/public/",
 		GracefulShutdownTimeout: 5 * time.Second,
 		Status:                  0,
+		ClientLogger:            clientLogHandler,
+		ServerLogger:            serverLogHandler,
+		LoadTimeLogger:          loadLogHandler,
 	}
 
 	server = http.Server{
@@ -111,6 +123,8 @@ func (con *Controller) Maintenance() {
 // ServeHTTP function routes all requests for the public web server. It is used in the main
 // function inside of the http.ListenAndServe() function for the public host.
 func (con *Controller) ServeHTTP(res http.ResponseWriter, req *http.Request) {
+	startTime := time.Now()
+
 	switch con.Status {
 	case 0: // This will actually never show because this function won't run if the server is off
 		http.Error(res, "The server is currently down and not serving requests.", http.StatusServiceUnavailable)
@@ -135,6 +149,7 @@ func (con *Controller) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 	f, err := os.Open(path)
 
 	if err != nil {
+		con.ClientLogger.Write(path + "::" + strconv.Itoa(http.StatusNotFound) + "::" + err.Error())
 		routing.HttpThrowStatus(http.StatusNotFound, res)
 		return
 	}
@@ -142,6 +157,7 @@ func (con *Controller) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 	contentType, err := routing.GetContentType(path)
 
 	if err != nil {
+		con.ClientLogger.Write(path + "::" + strconv.Itoa(http.StatusUnsupportedMediaType) + "::" + err.Error())
 		routing.HttpThrowStatus(http.StatusUnsupportedMediaType, res)
 		return
 	}
@@ -150,7 +166,11 @@ func (con *Controller) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 	_, err = io.Copy(res, f)
 
 	if err != nil {
+		con.ServerLogger.Write(path + "::" + strconv.Itoa(http.StatusInternalServerError) + "::" + err.Error())
 		routing.HttpThrowStatus(http.StatusInternalServerError, res)
 		return
 	}
+
+	elapsedTime := time.Since(startTime)
+	con.LoadTimeLogger.Write(path + " rendered in " + strconv.FormatFloat(elapsedTime.Seconds(), 'f', 6, 64) + " seconds")
 }
diff --git a/pkg/webhost/webhost.go b/pkg/webhost/webhost.go
index 78c6513..dfdbc30 100644
--- a/pkg/webhost/webhost.go
+++ b/pkg/webhost/webhost.go
@@ -5,22 +5,28 @@ import (
 	"io"
 	"net/http"
 	"os"
+	"strconv"
 
 	"github.com/Ennovar/gPanel/pkg/api"
+	"github.com/Ennovar/gPanel/pkg/file"
 	"github.com/Ennovar/gPanel/pkg/public"
 	"github.com/Ennovar/gPanel/pkg/routing"
 )
 
 type Controller struct {
-	Directory string
-	Public    *public.Controller
+	Directory    string
+	Public       *public.Controller
+	ServerLogger *file.Handler
 }
 
 // New returns a new PrivateHost type.
 func New() Controller {
+	serverErrorLogger, _ := file.Open(file.LOG_SERVER_ERRORS, true, true)
+
 	return Controller{
-		Directory: "document_roots/webhost/",
-		Public:    public.New(),
+		Directory:    "document_roots/webhost/",
+		Public:       public.New(),
+		ServerLogger: serverErrorLogger,
 	}
 }
 
@@ -36,6 +42,7 @@ func (con *Controller) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 
 	if reqAuth(path) {
 		if !checkAuth(res, req) {
+			con.ServerLogger.Write(path + "::" + strconv.Itoa(http.StatusUnauthorized) + "::" + http.StatusText(http.StatusUnauthorized))
 			http.Error(res, http.StatusText(http.StatusUnauthorized), http.StatusUnauthorized)
 			return
 		}
@@ -51,6 +58,7 @@ func (con *Controller) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 	f, err := os.Open(path)
 
 	if err != nil {
+		con.ServerLogger.Write(path + "::" + strconv.Itoa(http.StatusNotFound) + "::" + err.Error())
 		routing.HttpThrowStatus(http.StatusNotFound, res)
 		return
 	}
@@ -58,6 +66,7 @@ func (con *Controller) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 	contentType, err := routing.GetContentType(path)
 
 	if err != nil {
+		con.ServerLogger.Write(path + "::" + strconv.Itoa(http.StatusUnsupportedMediaType) + "::" + err.Error())
 		routing.HttpThrowStatus(http.StatusUnsupportedMediaType, res)
 		return
 	}
@@ -66,6 +75,7 @@ func (con *Controller) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 	_, err = io.Copy(res, f)
 
 	if err != nil {
+		con.ServerLogger.Write(path + "::" + strconv.Itoa(http.StatusInternalServerError) + "::" + err.Error())
 		routing.HttpThrowStatus(http.StatusInternalServerError, res)
 		return
 	}

From 20e16bea78d0876a2051b835c3baad3df28d1ee4 Mon Sep 17 00:00:00 2001
From: George Shaw <george.e.shaw.iv@outlook.com>
Date: Fri, 10 Nov 2017 16:38:02 -0600
Subject: [PATCH 5/5] truncate log file api complete

---
 .../js/panelHandlers/diagnostics/deleteLog.js | 50 +++++++++++++++++++
 .../js/panelHandlers/diagnostics/viewLog.js   |  9 ++--
 document_roots/webhost/gPanel.html            |  3 +-
 pkg/api/api_handler.go                        |  2 +
 pkg/api/logs/delete.go                        | 31 +++++++++++-
 pkg/api/logs/read.go                          |  6 +--
 pkg/file/file.go                              | 37 ++++++++++++++
 7 files changed, 129 insertions(+), 9 deletions(-)
 create mode 100644 document_roots/webhost/assets/js/panelHandlers/diagnostics/deleteLog.js

diff --git a/document_roots/webhost/assets/js/panelHandlers/diagnostics/deleteLog.js b/document_roots/webhost/assets/js/panelHandlers/diagnostics/deleteLog.js
new file mode 100644
index 0000000..21b07ba
--- /dev/null
+++ b/document_roots/webhost/assets/js/panelHandlers/diagnostics/deleteLog.js
@@ -0,0 +1,50 @@
+var logModal = jQuery('.view-log-modal');
+
+jQuery('._js_diagnostics-clear-log').on('click', function(e){
+  e.preventDefault();
+
+  var logName = jQuery(this).attr('data');
+
+  var title;
+  switch(logName) {
+    case "client_errors":
+      title = "Client Error Log (4xx)";
+      break;
+    case "server_errors":
+      title = "Server Error Log (5xx)";
+      break;
+    case "load_time":
+      title = "Load Time Log";
+      break;
+    default:
+      return;
+      break;
+  }
+
+  var ensure = confirm('Are you sure you want to clear ' + title + '?');
+  if (ensure)  {
+    var requestData = {};
+    requestData["name"] = logName+".log";
+
+    var xhr = new XMLHttpRequest();
+    xhr.open('UPDATE', 'api/logs/delete', true);
+    xhr.send(JSON.stringify(requestData));
+
+    xhr.onloadend = function() {
+      if(xhr.status == 204) {
+        jQuery(logModal).find('.modal-body textarea').html('The log is currently empty.');
+      }
+      else {
+        if(xhr.response != undefined && xhr.response.length != 0) {
+          alert(xhr.response);
+        }
+        else {
+          alert("An error has occurred, please contact your webhost administrator.");
+        }
+      }
+    }
+  }
+  else {
+    return;
+  }
+});
diff --git a/document_roots/webhost/assets/js/panelHandlers/diagnostics/viewLog.js b/document_roots/webhost/assets/js/panelHandlers/diagnostics/viewLog.js
index c8bd50e..d3e6bc9 100644
--- a/document_roots/webhost/assets/js/panelHandlers/diagnostics/viewLog.js
+++ b/document_roots/webhost/assets/js/panelHandlers/diagnostics/viewLog.js
@@ -8,19 +8,20 @@ jQuery('._js_diagnostics-view-log').on('click', function(e){
   var title;
   switch(logName) {
     case "client_errors":
-      title = "Client Error Log (4xx)"
+      title = "Client Error Log (4xx)";
       break;
     case "server_errors":
-      title = "Server Error Log (5xx)"
+      title = "Server Error Log (5xx)";
       break;
     case "load_time":
-      title = "Load Time Log"
+      title = "Load Time Log";
       break;
     default:
       return;
       break;
   }
   jQuery(logModal).find('.modal-title').html(title);
+  jQuery(logModal).find('._js_diagnostics-clear-log').attr('data', logName);
 
   var requestData = {};
   requestData["name"] = logName+".log";
@@ -44,7 +45,7 @@ jQuery('._js_diagnostics-view-log').on('click', function(e){
       jQuery(logModal).modal('show');
     }
     else {
-      if(xhr.response) {
+      if(xhr.response != undefined && xhr.response.length != 0) {
         alert(xhr.response);
       }
       else {
diff --git a/document_roots/webhost/gPanel.html b/document_roots/webhost/gPanel.html
index 489963d..87681ca 100644
--- a/document_roots/webhost/gPanel.html
+++ b/document_roots/webhost/gPanel.html
@@ -41,7 +41,7 @@
           </div>
           <div class="modal-footer">
             <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-            <button type="button" class="btn btn-danger">Clear Log</button>
+            <button type="button" class="btn btn-danger _js_diagnostics-clear-log" data="">Clear Log</button>
           </div>
         </div>
       </div>
@@ -111,6 +111,7 @@
     <script type="text/javascript" src="assets/js/panelHandlers/publicServer/restart.js"></script>
 
     <script type="text/javascript" src="assets/js/panelHandlers/diagnostics/viewLog.js"></script>
+    <script type="text/javascript" src="assets/js/panelHandlers/diagnostics/deleteLog.js"></script>
     <!-- KEEP AT BOTTOM OF BODY TAGS -->
   </body>
 </html>
diff --git a/pkg/api/api_handler.go b/pkg/api/api_handler.go
index a7c19f2..d0f91fc 100644
--- a/pkg/api/api_handler.go
+++ b/pkg/api/api_handler.go
@@ -42,6 +42,8 @@ func HandleAPI(res http.ResponseWriter, req *http.Request, path string, publicSe
 		return true, server.Maintenance(res, req, publicServer)
 	case "/logs/read":
 		return true, logs.Read(res, req)
+	case "/logs/delete":
+		return true, logs.Delete(res, req)
 	default:
 		return false, false
 	}
diff --git a/pkg/api/logs/delete.go b/pkg/api/logs/delete.go
index d342f98..cb7ecac 100644
--- a/pkg/api/logs/delete.go
+++ b/pkg/api/logs/delete.go
@@ -4,10 +4,12 @@ package logs
 import (
 	"encoding/json"
 	"net/http"
+
+	"github.com/Ennovar/gPanel/pkg/file"
 )
 
 func Delete(res http.ResponseWriter, req *http.Request) bool {
-	if req.Method != "GET" {
+	if req.Method != "UPDATE" {
 		http.Error(res, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed)
 		return false
 	}
@@ -22,5 +24,32 @@ func Delete(res http.ResponseWriter, req *http.Request) bool {
 		return false
 	}
 
+	valid := false
+	for _, log := range file.KNOWN_LOGS {
+		if log == deleteLogRequestData.Name {
+			valid = true
+			break
+		}
+	}
+
+	if !valid {
+		http.Error(res, "Attempting to delete an unknown log file.", http.StatusBadRequest)
+		return false
+	}
+
+	handle, err := file.Open(deleteLogRequestData.Name, true, true)
+	if err != nil {
+		http.Error(res, err.Error(), http.StatusBadRequest)
+		return false
+	}
+
+	closeErr, deleteErr := handle.Close(true)
+	if closeErr != nil || deleteErr != nil {
+		http.Error(res, closeErr.Error()+" AND "+deleteErr.Error(), http.StatusInternalServerError)
+		return false
+	}
+
+	res.WriteHeader(http.StatusNoContent)
+
 	return true
 }
diff --git a/pkg/api/logs/read.go b/pkg/api/logs/read.go
index 70e4095..9f62855 100644
--- a/pkg/api/logs/read.go
+++ b/pkg/api/logs/read.go
@@ -20,7 +20,7 @@ func Read(res http.ResponseWriter, req *http.Request) bool {
 
 	err := json.NewDecoder(req.Body).Decode(&readLogRequestData)
 	if err != nil {
-		http.Error(res, "0:"+err.Error(), http.StatusBadRequest)
+		http.Error(res, err.Error(), http.StatusBadRequest)
 		return false
 	}
 
@@ -39,14 +39,14 @@ func Read(res http.ResponseWriter, req *http.Request) bool {
 
 	handle, err := file.Open(readLogRequestData.Name, true, true)
 	if err != nil {
-		http.Error(res, "1:"+err.Error(), http.StatusBadRequest)
+		http.Error(res, err.Error(), http.StatusBadRequest)
 		return false
 	}
 	defer handle.Close(false)
 
 	data, err := handle.Read()
 	if err != nil {
-		http.Error(res, "2:"+err.Error(), http.StatusBadRequest)
+		http.Error(res, err.Error(), http.StatusBadRequest)
 		return false
 	}
 
diff --git a/pkg/file/file.go b/pkg/file/file.go
index 99ff357..ebef3f2 100644
--- a/pkg/file/file.go
+++ b/pkg/file/file.go
@@ -18,6 +18,7 @@ var KNOWN_LOGS = [...]string{LOG_CLIENT_ERRORS, LOG_SERVER_ERRORS, LOG_LOADTIME}
 type Handler struct {
 	fileHandle *os.File
 	path       string
+	append     bool
 }
 
 func Open(file string, append bool, log bool) (*Handler, error) {
@@ -56,7 +57,33 @@ func Open(file string, append bool, log bool) (*Handler, error) {
 	}, nil
 }
 
+func (h *Handler) checkExistence(createIfNotExist bool) (bool, error) {
+	if _, err := os.Stat(h.path); os.IsNotExist(err) {
+		if createIfNotExist {
+			if h.append {
+				h.fileHandle, err = os.OpenFile(h.path, os.O_APPEND|os.O_CREATE|os.O_RDWR, 0644)
+			} else {
+				h.fileHandle, err = os.OpenFile(h.path, os.O_TRUNC|os.O_CREATE|os.O_RDWR, 0644)
+			}
+
+			if err != nil {
+				return false, err
+			}
+			return false, nil
+		} else {
+			return false, nil
+		}
+	}
+
+	return true, nil
+}
+
 func (h *Handler) Read() ([]byte, error) {
+	_, err := h.checkExistence(true)
+	if err != nil {
+		return nil, err
+	}
+
 	data, err := ioutil.ReadAll(h.fileHandle)
 	if err != nil {
 		return nil, err
@@ -66,6 +93,11 @@ func (h *Handler) Read() ([]byte, error) {
 }
 
 func (h *Handler) Write(data string) (int, error) {
+	_, err := h.checkExistence(true)
+	if err != nil {
+		return 0, err
+	}
+
 	written, err := h.fileHandle.Write([]byte(data + "\n"))
 	if err != nil {
 		return 0, err
@@ -75,6 +107,11 @@ func (h *Handler) Write(data string) (int, error) {
 }
 
 func (h *Handler) Close(delete bool) (error, error) {
+	exist, _ := h.checkExistence(false)
+	if !exist {
+		return nil, nil
+	}
+
 	closeErr := h.fileHandle.Close()
 
 	if delete {