add options for time, id and app name

Author: doorbash

README.md

@@ -19,31 +19,34 @@ go build
   -p, --password=        BasicAuth password
   -l, --log-buffer-size= Log buffer size (default: 200)
   -i, --interval=        PM2 process-list update interval in seconds (default: 10)
-      --actions          Whether to show start, stop and restart buttons or not
+      --time             Show log time
+      --app-id           Show app id
+      --app-name         Show app name
+      --actions          Show start, stop and restart buttons
 ```
 
 ## Example
 
 ### Run without authentication:
 
 ```
-./pm2-web localhost:3030
+./pm2-web --time --app-name --actions localhost:3030
 ```
 
 **or using PM2:**
 ```
-pm2 start --name pm2-web ./pm2-web -- localhost:3030
+pm2 start --name pm2-web ./pm2-web -- --time --app-name --actions localhost:3030
 ```
 
 ### Run with authentication:
 
 ```
-./pm2-web -u admin -p 1234 localhost:3030
+./pm2-web -u admin -p 1234 --time --app-name --actions localhost:3030
 ```
 
 **or using PM2:**
 ```
-pm2 start --name pm2-web ./pm2-web -- -u admin -p 1234 localhost:3030
+pm2 start --name pm2-web ./pm2-web -- -u admin -p 1234 --time --app-name --actions localhost:3030
 ```
 
 ### Run behind reverse proxy:

main.go

@@ -10,14 +10,19 @@ import (
 	"github.com/jessevdk/go-flags"
 )
 
-var opts struct {
+type Options struct {
 	Username       string `short:"u" long:"username" description:"BasicAuth username" required:"false" default:""`
 	Password       string `short:"p" long:"password" description:"BasicAuth password" required:"false" default:""`
 	LogBufferSize  int    `short:"l" long:"log-buffer-size" description:"Log buffer size" required:"false" default:"200"`
 	Interval       int    `short:"i" long:"interval" description:"PM2 process-list update interval in seconds" required:"false" default:"10"`
-	ActionsEnabled bool   `long:"actions" description:"Whether to show start, stop and restart buttons or not" required:"false"`
+	TimeEnabled    bool   `long:"time" description:"Show log time" required:"false"`
+	IdEnabled      bool   `long:"app-id" description:"Show app id" required:"false"`
+	AppNameEnabled bool   `long:"app-name" description:"Show app name" required:"false"`
+	ActionsEnabled bool   `long:"actions" description:"Show start, stop and restart buttons"`
 }
 
+var opts Options
+
 type LogData struct {
 	Type string
 	Data interface{}
@@ -67,7 +72,7 @@ func main() {
 	}()
 
 	pm2 := NewPM2(time.Duration(opts.Interval)*time.Second, opts.LogBufferSize).Run()
-	if err := NewHTTPServer(args[0], opts.Username, opts.Password, opts.ActionsEnabled, pm2).Run(); err != nil {
+	if err := NewHTTPServer(args[0], &opts, pm2).Run(); err != nil {
 		log.Fatalln(err)
 	}
 }

server.go

@@ -16,18 +16,18 @@ type HttpServer struct {
 	upgrader websocket.Upgrader
 }
 
-func NewHTTPServer(addr, username, password string, actionsEnabled bool, pm2 *PM2) *HttpServer {
+func NewHTTPServer(addr string, options *Options, pm2 *PM2) *HttpServer {
 	return (&HttpServer{
 		upgrader: websocket.Upgrader{
 			ReadBufferSize:  1024,
 			WriteBufferSize: 1024,
 			CheckOrigin:     func(r *http.Request) bool { return true },
 		},
 		Addr: addr,
-	}).init(username, password, actionsEnabled, pm2)
+	}).init(options, pm2)
 }
 
-func (s *HttpServer) init(username, password string, actionsEnabled bool, pm2 *PM2) *HttpServer {
+func (s *HttpServer) init(options *Options, pm2 *PM2) *HttpServer {
 	staticHandler := http.FileServer(http.Dir("./static"))
 
 	jsHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -37,7 +37,7 @@ func (s *HttpServer) init(username, password string, actionsEnabled bool, pm2 *P
 			return
 		}
 		w.Header().Add("Content-Type", "text/javascript")
-		err = templ.Execute(w, actionsEnabled)
+		err = templ.Execute(w, options)
 		if err != nil {
 			fmt.Println(err)
 		}
@@ -131,19 +131,19 @@ func (s *HttpServer) init(username, password string, actionsEnabled bool, pm2 *P
 		}
 	})
 
-	if username == "" {
+	if options.Username == "" {
 		http.Handle("/", staticHandler)
 		http.Handle("/script.js", jsHandler)
 		http.Handle("/logs", logsHandler)
-		if actionsEnabled {
+		if options.ActionsEnabled {
 			http.Handle("/action", actionHandler)
 		}
 	} else {
-		http.Handle("/", httpauth.SimpleBasicAuth(username, password)(staticHandler))
-		http.Handle("/script.js", httpauth.SimpleBasicAuth(username, password)(jsHandler))
-		http.Handle("/logs", httpauth.SimpleBasicAuth(username, password)(logsHandler))
-		if actionsEnabled {
-			http.Handle("/action", httpauth.SimpleBasicAuth(username, password)(actionHandler))
+		http.Handle("/", httpauth.SimpleBasicAuth(options.Username, options.Password)(staticHandler))
+		http.Handle("/script.js", httpauth.SimpleBasicAuth(options.Username, options.Password)(jsHandler))
+		http.Handle("/logs", httpauth.SimpleBasicAuth(options.Username, options.Password)(logsHandler))
+		if options.ActionsEnabled {
+			http.Handle("/action", httpauth.SimpleBasicAuth(options.Username, options.Password)(actionHandler))
 		}
 	}
 

static/script.js

@@ -1,7 +1,7 @@
-const SHOW_ACTIONS = {{.}};
-const SHOW_TIME = true;
-const SHOW_ID = false;
-const SHOW_APP_NAME = true;
+const SHOW_ACTIONS = {{.ActionsEnabled}};
+const SHOW_TIME = {{.TimeEnabled}};
+const SHOW_ID = {{.IdEnabled}};
+const SHOW_APP_NAME = {{.AppNameEnabled}};
 
 let host = window.document.location.host.replace(/:.*/, '');
 let pathname = window.location.pathname