Merge pull request #536 from statping/misc-updates

Small code changes, removals
pull/394/head
Hunter Long 2020-04-26 17:58:35 -07:00 committed by GitHub
commit e4ed216833
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 5 deletions

View File

@ -6,12 +6,12 @@ import (
) )
func parseFlags(cmd *cobra.Command) { func parseFlags(cmd *cobra.Command) {
cmd.PersistentFlags().StringVarP(&ipAddress, "ip", "s", "0.0.0.0", "server port") cmd.PersistentFlags().StringVarP(&ipAddress, "ip", "s", "0.0.0.0", "server run on host")
viper.BindPFlag("ip", cmd.PersistentFlags().Lookup("ip")) viper.BindPFlag("ip", cmd.PersistentFlags().Lookup("ip"))
cmd.PersistentFlags().IntVarP(&port, "port", "p", 8080, "server port") cmd.PersistentFlags().IntVarP(&port, "port", "p", 8080, "server port")
viper.BindPFlag("port", cmd.PersistentFlags().Lookup("port")) viper.BindPFlag("port", cmd.PersistentFlags().Lookup("port"))
cmd.PersistentFlags().IntVarP(&verboseMode, "verbose", "v", 2, "server port") cmd.PersistentFlags().IntVarP(&verboseMode, "verbose", "v", 2, "verbose logging")
viper.BindPFlag("verbose", cmd.PersistentFlags().Lookup("verbose")) viper.BindPFlag("verbose", cmd.PersistentFlags().Lookup("verbose"))
} }

View File

@ -23,7 +23,6 @@ var (
COMMIT string COMMIT string
ipAddress string ipAddress string
//grpcPort int //grpcPort int
envFile string
verboseMode int verboseMode int
port int port int
log = utils.Log.WithField("type", "cmd") log = utils.Log.WithField("type", "cmd")

View File

@ -51,6 +51,7 @@ func Router() *mux.Router {
r.PathPrefix("/css/").Handler(http.StripPrefix(basePath, Gzip(staticAssets("css")))) r.PathPrefix("/css/").Handler(http.StripPrefix(basePath, Gzip(staticAssets("css"))))
r.PathPrefix("/js/").Handler(http.StripPrefix(basePath, Gzip(staticAssets("js")))) r.PathPrefix("/js/").Handler(http.StripPrefix(basePath, Gzip(staticAssets("js"))))
r.PathPrefix("/scss/").Handler(http.StripPrefix(basePath, Gzip(staticAssets("scss"))))
r.PathPrefix("/robots.txt").Handler(http.StripPrefix(basePath, indexHandler)) r.PathPrefix("/robots.txt").Handler(http.StripPrefix(basePath, indexHandler))
r.PathPrefix("/favicon.ico").Handler(http.StripPrefix(basePath, indexHandler)) r.PathPrefix("/favicon.ico").Handler(http.StripPrefix(basePath, indexHandler))
r.PathPrefix("/banner.png").Handler(http.StripPrefix(basePath, indexHandler)) r.PathPrefix("/banner.png").Handler(http.StripPrefix(basePath, indexHandler))

View File

@ -129,8 +129,6 @@ func CreateAllAssets(folder string) error {
MakePublicFolder(fp(folder, "assets", "js")) MakePublicFolder(fp(folder, "assets", "js"))
MakePublicFolder(fp(folder, "assets", "css")) MakePublicFolder(fp(folder, "assets", "css"))
MakePublicFolder(fp(folder, "assets", "scss")) MakePublicFolder(fp(folder, "assets", "scss"))
MakePublicFolder(fp(folder, "assets", "font"))
MakePublicFolder(fp(folder, "assets", "files"))
log.Infoln("Inserting scss, css, and javascript files into assets folder") log.Infoln("Inserting scss, css, and javascript files into assets folder")
if err := CopyAllToPublic(TmplBox); err != nil { if err := CopyAllToPublic(TmplBox); err != nil {