Skip to content
This repository has been archived by the owner on Mar 10, 2021. It is now read-only.

Commit

Permalink
Merge e01e909 into 9884a7d
Browse files Browse the repository at this point in the history
  • Loading branch information
@obalunenko
obalunenko authored Dec 8, 2018
2 parents 9884a7d + e01e909 commit 336a304
Show file tree
Hide file tree
Showing 42 changed files with 6,990 additions and 274 deletions.
41 changes: 24 additions & 17 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,24 +76,28 @@ Tool could be configured in 3 ways:
***LogLevel** - stdout log level: All, Debug, Info, Error, Fatal, Panic, Warn (default Debug)
***LogsFilesListJSON** - JSON with list of all files that need to be looked at and converted
***MongoURL** - Mongo URL (default localhost:27017)
***MongoDB** - Mongo DB name (default myDB)
***DBURL** - DB URL (default localhost:27017)
***DBName** - DB name (default myDB)
***MongoCollection** - Mongo DB collection (default logs)
***MongoUsername** - Mongo DB Username
***MongoPassword** - Mongo DB password
***DBUsername** - Mongo DB Username
***DBPassword** - Mongo DB password
***DropDB** - if true - will drop whole collection before starting to store all logs
***FilesMustExist*** - if true - will throw error when file is not exist; when false - wait for file create
***FollowFiles*** - if true - will tail file and wait for updates; when false - end file reading after EOF
example of `config.toml`:
```toml
LogLevel="Debug"
LogsFilesListJSON='{"testdata/testfile1.log":"second_format","testdata/dir1/testfile2.log":"first_format"}'
MongoURL="localhost:27017"
MongoDB="myDB"
DBURL="localhost:27017"
DBName="myDB"
MongoCollection="logs"
MongoUsername=""
MongoPassword=""
DropDB=false
DBUsername=""
DBPassword=""
DropDB=true
FilesMustExist=true
FollowFiles=true
```
### environment variables
Expand All @@ -104,12 +108,15 @@ example:
```bash
export LOGSCONVERTER_DROPDB=false
export LOGSCONVERTER_LOGLEVEL="Info"
export LOGSCONVERTER_LOGSFILESLISTJSON='{"testdata/testfile1.log":"second_format","testdata/dir1/testfile2.log":"first_format"}'
export LOGSCONVERTER_MONGOCOLLECTION="logs"
export LOGSCONVERTER_MONGODB="myDB"
export LOGSCONVERTER_MONGOURL="localhost:27017"
export LOGSCONVERTER_MONGOUSERNAME=""
export LOGSCONVERTER_MONGOPASSWORD=""
export LOGSCONVERTER_DB_NAME="myDB"
export LOGSCONVERTER_DB_PASSWORD=""
export LOGSCONVERTER_DBURL="localhost:27017"
export LOGSCONVERTER_DB_USERNAME=""
export LOGSCONVERTER_DROP_DB=false
export LOGSCONVERTER_FILES_MUST_EXIST=false
export LOGSCONVERTER_FOLLOW_FILES=true
export LOGSCONVERTER_LOG_LEVEL="Info"
export LOGSCONVERTER_LOGS_FILES_LIST_JSON='{"testdata/testfile1.log":"second_format","testdata/dir1/testfile2.log":"first_format"}'
export LOGSCONVERTER_MONGO_COLLECTION="logs"
```
76 changes: 42 additions & 34 deletions config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,39 +14,47 @@ import (
type Config struct {
LogsFilesListJSON string `required:"true"` // (example: '{"/log1.txt":"first_format ", "/dir/log2.log":"second_format "}'
LogLevel string `default:"Info"` // tool's logs level in stdout
LogsFilesList map[string]string `json:"-"` // LogsFilesList store unmarshalled json LogsFilesListJSON
MongoURL string `required:"true"` // Mongo URL
MongoUsername string `default:""` // MongoUsername
MongoPassword string `default:""` // MongoPassword
MongoDB string `default:"myDB"` // Mongo DB name
logsFilesList map[string]string `json:"-"` // LogsFilesList store unmarshalled json LogsFilesListJSON
DBURL string `required:"true"` // Database URL
DBUsername string `default:""` // Database Username
DBPassword string `default:""` // DBPassword
DBName string `default:"myDB"` // DB name
MongoCollection string `default:"logs"` // Mongo DB collection
DropDB bool `default:"false"` // if true - will dorp whole collection
FollowFiles bool `default:"true"` // if true - will tail file and wait for updates
FilesMustExist bool `default:"true"` // if true - will throw error when file is not exist; when false - wait for file create

}

// Help output for flags when program run with -h flag
func setFlagsHelp() map[string]string {
usageMsg := make(map[string]string)

usageMsg["LogsFilesListJSON"] = `JSON with list of all files that need to be looked at and converted
example of JSON:
{
"/log1.txt":"first_format",
"/dir/log2.log":"second_format",
"/dir2/log3.txt":"first_format"
}
`
usageMsg["logs-files-list-json"] = `JSON with list of all files that need to be looked at and converted
example of JSON:
{
"/log1.txt":"first_format",
"/dir/log2.log":"second_format",
"/dir2/log3.txt":"first_format"
}`
usageMsg["LogLevel"] = `LogLevel level: All, Debug, Info, Error, Fatal, Panic, Warn`

usageMsg["MongoURL"] = "Mongo URL"
usageMsg["DBURL"] = "Mongo URL"
usageMsg["MongoCollection"] = "Mongo DB collection"
usageMsg["MongoDB"] = "Mongo DB name"
usageMsg["DBName"] = "Mongo DB name"
usageMsg["DropDB"] = "if true - will drop whole collection before starting to store all logs"
usageMsg["MongoPassword"] = "MongoDB Password"
usageMsg["MongoUsername"] = "MongoDB Username"
usageMsg["DBPassword"] = "DBName Password"
usageMsg["DBUsername"] = "DBName Username"
usageMsg["FollowFiles"] = ` if true - will tail file and wait for updates; when false - end file reading after EOF`
usageMsg["FilesMustExist"] = `if true - will throw error when file is not exist; when false - wait for file create`

return usageMsg
}

// GetFilesList returns list of log files with filename and format
func (cfg *Config) GetFilesList() map[string]string {
return cfg.logsFilesList
}

// LoadConfig loads configuration struct from env vars, flags or from toml file
func LoadConfig(configPath string) (*Config, error) {

Expand All @@ -58,48 +66,48 @@ func LoadConfig(configPath string) (*Config, error) {

err := m.Load(svcConfig)
if err != nil {

log.Errorf("Failed to load configuration: %v", err)
return nil, fmt.Errorf("failed to load configuration: %v", err)
}

setLogger(svcConfig)

// Parse log files names with formats
svcConfig.LogsFilesList = make(map[string]string)
errUnMarshal := json.Unmarshal([]byte(svcConfig.LogsFilesListJSON), &svcConfig.LogsFilesList)
if errUnMarshal != nil {
log.Errorf("Failed to unmarshal json with files [%s] to struct: %v", svcConfig.LogsFilesListJSON, errUnMarshal)
return nil, fmt.Errorf("failed to unmarshal json with files [%s] to struct: %v", svcConfig.LogsFilesListJSON, errUnMarshal)
svcConfig.logsFilesList, err = parseLogsFilesList(svcConfig.LogsFilesListJSON)
if err != nil {
return nil, err
}

err = m.Validate(svcConfig)
if err != nil {

log.Errorf("Config struct is invalid: %v\n", err)
return nil, fmt.Errorf("config struct is invalid: %v", err)
}
if len(svcConfig.LogsFilesList) == 0 {

log.Errorf("No log files provided: [%+v]", svcConfig.LogsFilesList)
return nil, fmt.Errorf("No log files provided: [%+v]", svcConfig.LogsFilesList)
if len(svcConfig.logsFilesList) == 0 {
return nil, fmt.Errorf("no log files provided: [%+v]", svcConfig.logsFilesList)
}

log.Infof("Configuration loaded\n")

prettyConfig, err := json.MarshalIndent(svcConfig, "", "")
if err != nil {

log.Errorf("Failed to marshal indent config: %v", err)
return nil, fmt.Errorf("failed to marshal indent config: %v", err)

}
log.Infof("Current config:\n %s", string(prettyConfig))

return svcConfig, nil

}

func parseLogsFilesList(filesListJSON string) (map[string]string, error) {
filesList := make(map[string]string)

errUnMarshal := json.Unmarshal([]byte(filesListJSON), &filesList)
if errUnMarshal != nil {
return nil, fmt.Errorf("failed to unmarshal json with files [%s] to struct: %v", filesListJSON, errUnMarshal)
}
return filesList, nil

}

// Implementation of default loader for multiconfig
func newConfig(path string, prefix string, camelCase bool) *multiconfig.DefaultLoader {
var loaders []multiconfig.Loader
Expand Down
Loading

0 comments on commit 336a304

Please sign in to comment.