Moving logging configuration into its own section of the config

This commit is contained in:
Jordan Wright 2018-10-06 17:51:49 -05:00
parent bef52d36f1
commit 10aa98b760
3 changed files with 17 additions and 10 deletions

View file

@ -15,5 +15,7 @@
"db_path": "gophish.db",
"migrations_prefix": "db/db_",
"contact_address": "",
"log_file": ""
"logging": {
"filename": ""
}
}

View file

@ -21,16 +21,21 @@ type PhishServer struct {
KeyPath string `json:"key_path"`
}
// LoggingConfig represents configuration details for Gophish logging.
type LoggingConfig struct {
Filename string `json:"filename"`
}
// Config represents the configuration information.
type Config struct {
AdminConf AdminServer `json:"admin_server"`
PhishConf PhishServer `json:"phish_server"`
DBName string `json:"db_name"`
DBPath string `json:"db_path"`
MigrationsPath string `json:"migrations_prefix"`
TestFlag bool `json:"test_flag"`
ContactAddress string `json:"contact_address"`
LogFile string `json:"log_file"`
AdminConf AdminServer `json:"admin_server"`
PhishConf PhishServer `json:"phish_server"`
DBName string `json:"db_name"`
DBPath string `json:"db_path"`
MigrationsPath string `json:"migrations_prefix"`
TestFlag bool `json:"test_flag"`
ContactAddress string `json:"contact_address"`
Logging LoggingConfig `json:"logging"`
}
// Conf contains the initialized configuration struct

View file

@ -21,7 +21,7 @@ func init() {
func Setup() error {
Logger.SetLevel(logrus.InfoLevel)
// Set up logging to a file if specified in the config
logFile := config.Conf.LogFile
logFile := config.Conf.Logging.Filename
if logFile != "" {
f, err := os.OpenFile(logFile, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0644)
if err != nil {