Skip to content

Commit 84cac21

Browse files
committed
using libgolang/config
1 parent f604d80 commit 84cac21

File tree

2 files changed

+20
-41
lines changed

2 files changed

+20
-41
lines changed

Gopkg.lock

Lines changed: 9 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

main.go

Lines changed: 11 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,31 @@
11
package main
22

33
import (
4-
"flag"
54
"fmt"
65
"os"
7-
"strings"
86

97
"github.com/docker/go-plugins-helpers/volume"
8+
"github.com/libgolang/config"
109
"github.com/libgolang/docker-volume-linode/linode"
1110
"github.com/libgolang/log"
1211
)
1312

1413
var (
15-
token string
16-
logLevelParamPtr = param("log.leve", "DEBUG", "Log Level")
17-
logTraceParamPtr = flag.Bool("log.trace", false, "Set Tracing to true")
18-
19-
linodeTokenParamPtr = param("linode.token", "", "Required Personal Access Token generated in Linode Console.")
20-
hostParamPtr = param("host", hostname(), "Sets the cluster region")
21-
regionParamPtr = param("region", "us-west", "Sets the cluster region")
14+
token string
15+
logLevelParamPtr = config.String("log.leve", "INFO", "Log Level. Defaults to WARN")
16+
logTraceParamPtr = config.Bool("log.trace", false, "Set Tracing to true")
17+
linodeTokenParamPtr = config.String("linode.token", "", "Required Personal Access Token generated in Linode Console.")
18+
hostParamPtr = config.String("linode.host", hostname(), "Sets the cluster region")
19+
regionParamPtr = config.String("linode.region", "us-west", "Sets the cluster region")
2220
)
2321

2422
func main() {
25-
flag.Parse()
23+
config.AppName = "docker-volume-linode"
24+
config.Parse()
2625

2726
//
28-
//
29-
log.SetTrace(true)
30-
w := &log.WriterStdout{}
31-
w.SetLevel(log.DEBUG)
32-
log.SetWriters([]log.Writer{w})
33-
34-
//
35-
// Get token from `-linode.token` param or from LINODE_TOKEN environment variable
36-
//
37-
if *linodeTokenParamPtr != "" {
38-
token = *linodeTokenParamPtr
39-
} else {
40-
token = os.Getenv("LINODE_TOKEN")
41-
}
42-
os.Setenv("LOG_CONFIG", "")
43-
log.Debug("Using linode token: %s", token)
27+
log.GetDefaultWriter().SetLevel(log.StrToLevel(*logLevelParamPtr))
28+
log.SetTrace(*logTraceParamPtr)
4429

4530
// Linode API instance
4631
linodeAPI := linode.NewAPI(token, *regionParamPtr, *hostParamPtr)
@@ -53,18 +38,6 @@ func main() {
5338
fmt.Println(handler.ServeUnix("linode-driver", 0))
5439
}
5540

56-
func param(key, def, help string) *string {
57-
envKey := strings.Replace(strings.ToUpper(key), ".", "_", -1)
58-
return flag.String(key, getEnv(envKey, def), help)
59-
}
60-
61-
func getEnv(key, def string) string {
62-
if val, ok := os.LookupEnv(key); ok {
63-
return val
64-
}
65-
return def
66-
}
67-
6841
func hostname() string {
6942
h, _ := os.Hostname()
7043
return h

0 commit comments

Comments
 (0)