From 18163c1599ded007969911fae51c32bfa23987b4 Mon Sep 17 00:00:00 2001 From: dan Date: Sat, 4 Apr 2015 10:24:23 -0700 Subject: [PATCH] change the l4g.Critical, os.Exit combo to log.Fatal, because l4g defers output so the critical logs are not being seen --- pipeline.go | 8 +++----- redshift_basic_emitter.go | 7 +++---- redshift_manifest_emitter.go | 11 ++++------- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/pipeline.go b/pipeline.go index 1da2ad0..25acdde 100644 --- a/pipeline.go +++ b/pipeline.go @@ -1,8 +1,8 @@ package connector import ( + "log" "math" - "os" "time" "github.com/ezoic/go-kinesis" @@ -62,8 +62,7 @@ func (p Pipeline) ProcessShard(ksis *kinesis.Kinesis, shardID string) { shardInfo, err := ksis.GetShardIterator(args) if err != nil { - l4g.Critical("GetShardIterator ERROR: %v", err) - os.Exit(1) + log.Fatalf("GetShardIterator ERROR: %v\n", err) } shardIterator := shardInfo.ShardIterator @@ -85,8 +84,7 @@ func (p Pipeline) ProcessShard(ksis *kinesis.Kinesis, shardID string) { consecutiveErrorAttempts++ continue } else { - l4g.Critical("GetRecords ERROR: %v\n", err) - os.Exit(1) + log.Fatalf("GetRecords ERROR: %v\n", err) } } else { consecutiveErrorAttempts = 0 diff --git a/redshift_basic_emitter.go b/redshift_basic_emitter.go index bc8c6ca..3d6f37f 100644 --- a/redshift_basic_emitter.go +++ b/redshift_basic_emitter.go @@ -4,6 +4,7 @@ import ( "bytes" "database/sql" "fmt" + "log" "os" // Postgres package is used when sql.Open is called @@ -31,15 +32,13 @@ func (e RedshiftBasicEmtitter) Emit(b Buffer, t Transformer) { db, err := sql.Open("postgres", os.Getenv("REDSHIFT_URL")) if err != nil { - l4g.Critical(err) - os.Exit(1) + log.Fatal(err) } _, err = db.Exec(e.copyStatement(s3File)) if err != nil { - l4g.Critical(err) - os.Exit(1) + log.Fatal(err) } l4g.Debug("Redshift load completed.") diff --git a/redshift_manifest_emitter.go b/redshift_manifest_emitter.go index d633a46..d04c65e 100644 --- a/redshift_manifest_emitter.go +++ b/redshift_manifest_emitter.go @@ -5,6 +5,7 @@ import ( "database/sql" "encoding/json" "fmt" + "log" "os" "strings" "time" @@ -35,9 +36,7 @@ func (e RedshiftManifestEmitter) Emit(b Buffer, t Transformer) { db, err := sql.Open("postgres", os.Getenv("REDSHIFT_URL")) if err != nil { - l4g.Critical(err) - os.Exit(1) - + log.Fatal(err) } // Aggregate file paths as strings @@ -57,8 +56,7 @@ func (e RedshiftManifestEmitter) Emit(b Buffer, t Transformer) { _, err = db.Exec(c) if err != nil { - l4g.Critical(err) - os.Exit(1) + log.Fatal(err) } // Insert file paths into File Names table @@ -66,8 +64,7 @@ func (e RedshiftManifestEmitter) Emit(b Buffer, t Transformer) { _, err = db.Exec(i) if err != nil { - l4g.Critical(err) - os.Exit(1) + log.Fatal(err) } l4g.Info("[%v] copied to Redshift", manifestFileName)