diff --git a/d4-goclient.go b/d4-goclient.go index e61ab62..b365d49 100644 --- a/d4-goclient.go +++ b/d4-goclient.go @@ -68,7 +68,7 @@ type ( retry time.Duration rate time.Duration cc bool - json bool + json bool ca x509.CertPool d4error uint8 errnoCopy uint8 @@ -93,7 +93,7 @@ type ( redisPort string redisQueue string redisDB int - folderstr string + folderstr string } ) @@ -111,15 +111,15 @@ var ( tmpretry, _ = time.ParseDuration("30s") tmprate, _ = time.ParseDuration("200ms") - confdir = flag.String("c", "", "configuration directory") - debug = flag.Bool("v", false, "Set to True, true, TRUE, 1, or t to enable verbose output on stdout - Don't use in production") - ce = flag.Bool("ce", true, "Set to True, true, TRUE, 1, or t to enable TLS on network destination") - ct = flag.Duration("ct", tmpct, "Set timeout in human format") - cka = flag.Duration("cka", tmpcka, "Keep Alive time human format, 0 to disable") - retry = flag.Duration("rt", tmpretry, "Time in human format before retry after connection failure, set to 0 to exit on failure") - rate = flag.Duration("rl", tmprate, "Rate limiter: time in human format before retry after EOF") - cc = flag.Bool("cc", false, "Check TLS certificate against rootCA.crt") - jsonflag = flag.Bool("json", false, "The files watched are json files") + confdir = flag.String("c", "", "configuration directory") + debug = flag.Bool("v", false, "Set to True, true, TRUE, 1, or t to enable verbose output on stdout - Don't use in production") + ce = flag.Bool("ce", true, "Set to True, true, TRUE, 1, or t to enable TLS on network destination") + ct = flag.Duration("ct", tmpct, "Set timeout in human format") + cka = flag.Duration("cka", tmpcka, "Keep Alive time human format, 0 to disable") + retry = flag.Duration("rt", tmpretry, "Time in human format before retry after connection failure, set to 0 to exit on failure") + rate = flag.Duration("rl", tmprate, "Rate limiter: time in human format before retry after EOF") + cc = flag.Bool("cc", false, "Check TLS certificate against rootCA.crt") + jsonflag = flag.Bool("json", false, "The files watched are json files") ) func main() { @@ -352,12 +352,12 @@ func d4loadConfig(d4 *d4S) bool { if len((*d4).conf.source) < 1 { log.Fatal("Unsupported source") } - if (*d4).conf.source == "folder"{ + if (*d4).conf.source == "folder" { fstr := string(readConfFile(d4, "folder")) - if ffd , err := os.Stat(fstr); os.IsNotExist(err) { + if ffd, err := os.Stat(fstr); os.IsNotExist(err) { log.Fatal("Folder does not exist") - }else{ - if !ffd.IsDir(){ + } else { + if !ffd.IsDir() { log.Fatal("Folder is not a directory") } } diff --git a/go.mod b/go.mod index 03bd9a9..f8d5488 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/D4-project/d4-goclient go 1.13 require ( - github.com/D4-project/d4-golang-utils v0.1.6 + github.com/D4-project/d4-golang-utils v0.1.9 github.com/gomodule/redigo v2.0.0+incompatible + github.com/rjeczalik/notify v0.9.2 ) diff --git a/go.sum b/go.sum index 93fc34a..8d4d48f 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,21 @@ github.com/D4-project/d4-golang-utils v0.1.6 h1:g8To+VLwa5ucH8hcmRZGx/hmrHmn6AD6A0vaiYKFAQc= github.com/D4-project/d4-golang-utils v0.1.6/go.mod h1:GGR5KMhvABZtIfmS5jZkwQnBoP+9/V0ZEETSGiWLaM4= +github.com/D4-project/d4-golang-utils v0.1.9 h1:Q4auvPBc3gHPtUz3ZbixVP9ZMAXnQbn2UjBqicMeHOc= +github.com/D4-project/d4-golang-utils v0.1.9/go.mod h1:m0/tjCKtuSrD3HZPFFDhdtj07YhGNSmseF4EZsHB4sI= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE= github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0= github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= +github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/redislabs/redisgraph-go v2.0.2+incompatible/go.mod h1:GYn4oUFkbkHx49xm2H4G8jZziqKDKdRtDUuTBZTmqBE= +github.com/rjeczalik/notify v0.9.2 h1:MiTWrPj55mNDHEiIX5YUSKefw/+lCQVoAFmD6oQm5w8= +github.com/rjeczalik/notify v0.9.2/go.mod h1:aErll2f0sUX9PXZnVNyeiObbmTlk5jnMoCa4QEjJeqM= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7 h1:bit1t3mgdR35yN0cX0G8orgLtOuyL9Wqxa1mccLB0ig= +golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=