github/gPanel
2
0
Fork 0
mirror of https://github.com/donl/gPanel.git synced 2026-05-29 06:12:29 -06:00
Code Issues Projects Packages Wiki Activity Actions

Merge pull request #80 from george-e-shaw-iv/master

Browse source 
fixed logging
This commit is contained in:
George Shaw 2017-11-21 14:55:58 -06:00 • committed by GitHub
commit a5548e4201
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 53 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
account/assets/js/panelHandlers/log/view.js
View file

@ -24,7 +24,7 @@ jQuery('._js_diagnostics-view-log').on('click', function(e){
jQuery(logModal).find('._js_diagnostics-clear-log').attr('data', logName);
var requestData = {};
requestData["name"] = logName+".log";
requestData["name"] = logName;
var xhr = new XMLHttpRequest();
xhr.open('POST', 'api/log/read', true);

24
pkg/api/log/delete.go
View file

@ -10,7 +10,7 @@ import (
// Delete function is accessed from api/logs/delete and will attempt to
// delete a given log based off of request data.
func Delete(res http.ResponseWriter, req *http.Request) bool {
func Delete(res http.ResponseWriter, req *http.Request, dir string) bool {
if req.Method != "UPDATE" {
http.Error(res, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed)
return false
@ -26,20 +26,20 @@ 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)
var log string
switch deleteLogRequestData.Name {
case "client_errors":
log = dir + "logs/" + file.LOG_CLIENT_ERRORS
case "load_time":
log = dir + "logs/" + file.LOG_LOADTIME
case "server_errors":
log = file.LOG_SERVER_ERRORS
default:
http.Error(res, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
return false
}
handle, err := file.Open(deleteLogRequestData.Name, true, true)
handle, err := file.Open(log, true)
if err != nil {
http.Error(res, err.Error(), http.StatusBadRequest)
return false

24
pkg/api/log/read.go
View file

@ -10,7 +10,7 @@ import (
// Read function is accessed from api/logs/read and will attempt to read
// a given log based off of the request data.
func Read(res http.ResponseWriter, req *http.Request) bool {
func Read(res http.ResponseWriter, req *http.Request, dir string) bool {
if req.Method != "POST" {
http.Error(res, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed)
return false
@ -26,20 +26,20 @@ func Read(res http.ResponseWriter, req *http.Request) bool {
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)
var log string
switch readLogRequestData.Name {
case "client_errors":
log = dir + "logs/" + file.LOG_CLIENT_ERRORS
case "load_time":
log = dir + "logs/" + file.LOG_LOADTIME
case "server_errors":
log = file.LOG_SERVER_ERRORS
default:
http.Error(res, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
return false
}
handle, err := file.Open(readLogRequestData.Name, true, true)
handle, err := file.Open(log, true)
if err != nil {
http.Error(res, err.Error(), http.StatusBadRequest)
return false

12
pkg/file/file.go
View file

@ -9,12 +9,10 @@ import (
const (
LOG_CLIENT_ERRORS = "client_errors.log"
LOG_SERVER_ERRORS = "server_errors.log"
LOG_SERVER_ERRORS = "server/logs/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
@ -25,17 +23,13 @@ type Handler struct {
// This function takes a parameter append which if set to false will truncate the
// file upon writing to it. The log parameter denotes whether or not to look inside
// of the log folder when attempting to open a given file.
func Open(file string, append bool, log bool) (*Handler, error) {
func Open(file string, append 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)
}
absPath, err = filepath.Abs(file)
// Handle file path errors
if err != nil {

4
pkg/gpaccount/apihandler.go
View file

@ -39,9 +39,9 @@ func (con *Controller) apiHandler(res http.ResponseWriter, req *http.Request) (b
case "/server/maintenance":
return true, server.Maintenance(res, req, con.Public)
case "/log/read":
return true, log.Read(res, req)
return true, log.Read(res, req, con.Directory)
case "/log/delete":
return true, log.Delete(res, req)
return true, log.Delete(res, req, con.Directory)
default:
return false, false
}

17
pkg/gpaccount/gpaccount.go
View file

@ -8,6 +8,7 @@ import (
"strconv"
"time"
"github.com/Ennovar/gPanel/pkg/file"
"github.com/Ennovar/gPanel/pkg/public"
"github.com/Ennovar/gPanel/pkg/routing"
)
@ -19,7 +20,7 @@ type Controller struct {
Public *public.Controller
GracefulShutdownTimeout time.Duration
Status int
// ServerLogger *file.Handler
ServerLogger *file.Handler
}
var controller Controller
@ -27,16 +28,16 @@ var httpserver http.Server
// New returns a new Controller reference.
func New(dir string, accPort int, pubPort int) *Controller {
// serverErrorLogger, _ := file.Open(file.LOG_SERVER_ERRORS, true, true)
serverErrorLogger, _ := file.Open(file.LOG_SERVER_ERRORS, true)
controller = Controller{
Directory: dir,
DocumentRoot: "account/",
Port: accPort,
Public: public.New(dir+"public/", pubPort),
Public: public.New(dir, pubPort),
GracefulShutdownTimeout: 5 * time.Second,
Status: 0,
// ServerLogger: serverErrorLogger,
ServerLogger: serverErrorLogger,
}
httpserver = http.Server{
@ -62,7 +63,7 @@ func (con *Controller) ServeHTTP(res http.ResponseWriter, req *http.Request) {
if reqAuth(path) {
if !con.checkAuth(res, req) {
// con.ServerLogger.Write(path + "::" + strconv.Itoa(http.StatusUnauthorized) + "::" + http.StatusText(http.StatusUnauthorized))
con.ServerLogger.Write(path + "::" + strconv.Itoa(http.StatusUnauthorized) + "::" + http.StatusText(http.StatusUnauthorized))
http.Error(res, http.StatusText(http.StatusUnauthorized), http.StatusUnauthorized)
return
}
@ -78,7 +79,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())
con.ServerLogger.Write(path + "::" + strconv.Itoa(http.StatusNotFound) + "::" + err.Error())
routing.HttpThrowStatus(http.StatusNotFound, res)
return
}
@ -86,7 +87,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())
con.ServerLogger.Write(path + "::" + strconv.Itoa(http.StatusUnsupportedMediaType) + "::" + err.Error())
routing.HttpThrowStatus(http.StatusUnsupportedMediaType, res)
return
}
@ -95,7 +96,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())
con.ServerLogger.Write(path + "::" + strconv.Itoa(http.StatusInternalServerError) + "::" + err.Error())
routing.HttpThrowStatus(http.StatusInternalServerError, res)
return
}

27
pkg/public/public.go
View file

@ -9,6 +9,7 @@ import (
"strconv"
"time"
"github.com/Ennovar/gPanel/pkg/file"
"github.com/Ennovar/gPanel/pkg/routing"
)
@ -17,25 +18,25 @@ type Controller struct {
Port int
GracefulShutdownTimeout time.Duration
Status int
// ClientLogger *file.Handler
// LoadTimeLogger *file.Handler
ClientLogger *file.Handler
LoadTimeLogger *file.Handler
}
var controller Controller
var server http.Server
// New function returns a new PublicWeb type.
func New(root string, port int) *Controller {
// clientLogHandler, _ := file.Open(file.LOG_CLIENT_ERRORS, true, true)
// loadLogHandler, _ := file.Open(file.LOG_LOADTIME, true, true)
func New(dir string, port int) *Controller {
clientLogHandler, _ := file.Open(dir+"logs/"+file.LOG_CLIENT_ERRORS, true)
loadLogHandler, _ := file.Open(dir+"logs/"+file.LOG_LOADTIME, true)
controller = Controller{
DocumentRoot: root,
DocumentRoot: dir + "public/",
Port: port,
GracefulShutdownTimeout: 5 * time.Second,
Status: 0,
// ClientLogger: clientLogHandler,
// LoadTimeLogger: loadLogHandler,
ClientLogger: clientLogHandler,
LoadTimeLogger: loadLogHandler,
}
server = http.Server{
@ -52,7 +53,7 @@ func New(root string, port int) *Controller {
// 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()
startTime := time.Now()
switch con.Status {
case 0: // This will actually never show because this function won't run if the server is off
@ -78,7 +79,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())
con.ClientLogger.Write(path + "::" + strconv.Itoa(http.StatusNotFound) + "::" + err.Error())
routing.HttpThrowStatus(http.StatusNotFound, res)
return
}
@ -86,7 +87,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())
con.ClientLogger.Write(path + "::" + strconv.Itoa(http.StatusUnsupportedMediaType) + "::" + err.Error())
routing.HttpThrowStatus(http.StatusUnsupportedMediaType, res)
return
}
@ -100,6 +101,6 @@ func (con *Controller) ServeHTTP(res http.ResponseWriter, req *http.Request) {
return
}
// elapsedTime := time.Since(startTime)
// con.LoadTimeLogger.Write(path + " rendered in " + strconv.FormatFloat(elapsedTime.Seconds(), 'f', 6, 64) + " seconds")
elapsedTime := time.Since(startTime)
con.LoadTimeLogger.Write(path + " rendered in " + strconv.FormatFloat(elapsedTime.Seconds(), 'f', 6, 64) + " seconds")
}