diff --git a/Dockerfile b/Dockerfile index 7127c79..f7f8912 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,3 +17,9 @@ RUN curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh # setup the app dir/working directory RUN mkdir -p /go/src/github.com/nanopack/logvac WORKDIR /go/src/github.com/nanopack/logvac + +# copy the source +COPY . . + +# fetch deps +RUN make deps diff --git a/drain/drain.go b/drain/drain.go index 96c93f0..9e77bef 100644 --- a/drain/drain.go +++ b/drain/drain.go @@ -70,6 +70,7 @@ func Init() error { if err != nil { return fmt.Errorf("Failed to load drains - %s", err) } + config.Log.Info("3rd-party drains initialized") return nil } @@ -153,11 +154,13 @@ func publishInit() error { // InitDrains loads and configures drains from a config file. func InitDrains() error { + config.Log.Info("loading drains from db") drainDB, err := NewBoltArchive(filepath.Join(dbDir, "drains.bolt")) if err != nil { return fmt.Errorf("Failed to initialize drain db - %s", err) } defer drainDB.Close() + config.Log.Info("drains loaded from db") tDrains := make(map[string]logvac.Drain, 0) err = drainDB.Get("drainConfig", "drains", &tDrains) @@ -169,7 +172,7 @@ func InitDrains() error { for i := range tDrains { err := AddDrain(tDrains[i]) if err != nil { - return fmt.Errorf("Failed to load drain 'papertrail' - %s", err) + return fmt.Errorf("Failed to load 3rd-party drain '%s' - %s", i, err) } } @@ -179,6 +182,8 @@ func InitDrains() error { // AddDrain starts draining to a third party log service. func AddDrain(d logvac.Drain) error { + config.Log.Info("Adding drain '%s'", d.Type) + switch d.Type { case "papertrail": // if it already exists, close it and create a new one @@ -196,6 +201,7 @@ func AddDrain(d logvac.Drain) error { } drains["papertrail"] = pTrail drainCfg["papertrail"] = d + config.Log.Info("3rd-party drain 'papertrail' initialized") // case "datadog": // // if it already exists, close it and create a new one // if _, ok := drains["datadog"]; ok { diff --git a/drain/papertrail.go b/drain/papertrail.go index 88eb577..0d5a837 100644 --- a/drain/papertrail.go +++ b/drain/papertrail.go @@ -5,6 +5,7 @@ import ( "io" "net" + "github.com/nanopack/logvac/config" "github.com/nanopack/logvac/core" ) @@ -24,12 +25,14 @@ func NewPapertrailClient(uri string) (*Papertrail, error) { if err != nil { return nil, fmt.Errorf("Failed to dial papertrail - %s", err.Error()) } + + config.Log.Info("Connection to papertrail endpoint established") return &Papertrail{conn}, nil } // Init initializes a connection to mist -func (p Papertrail) Init() error { +func (p *Papertrail) Init() error { // add drain logvac.AddDrain("papertrail", p.Publish) @@ -38,7 +41,7 @@ func (p Papertrail) Init() error { } // Publish utilizes mist's Publish to "drain" a log message -func (p Papertrail) Publish(msg logvac.Message) { +func (p *Papertrail) Publish(msg logvac.Message) { p.Conn.Write(msg.Raw) }