From 33471fac2d28e7e65e9b0916b038af041850467b Mon Sep 17 00:00:00 2001 From: rasmus Date: Wed, 9 Nov 2022 16:00:44 +0200 Subject: [PATCH] rename mongoStruct to mongo_struct --- cmd/line.go => logmower/lines.go | 2 +- cmd/line_single.go => logmower/lines_single.go | 2 +- {cmd => logmower}/mongo.go | 2 +- {cmd => logmower}/sender.go | 2 +- {cmd => logmower}/submitter.go | 2 +- {cmd => logmower}/watcher.go | 4 +++- cmd/main.go => main.go | 8 ++++---- pkg/ctx_keys/ctx_keys.go | 15 +++++++++++++++ .../bsonLookup.go => mongo_struct/bson_lookup.go} | 2 +- .../mongo_struct.go} | 2 +- .../gather.go => mongo_struct/populate.go} | 4 +++- 11 files changed, 32 insertions(+), 13 deletions(-) rename cmd/line.go => logmower/lines.go (96%) rename cmd/line_single.go => logmower/lines_single.go (96%) rename {cmd => logmower}/mongo.go (98%) rename {cmd => logmower}/sender.go (97%) rename {cmd => logmower}/submitter.go (98%) rename {cmd => logmower}/watcher.go (98%) rename cmd/main.go => main.go (73%) create mode 100644 pkg/ctx_keys/ctx_keys.go rename pkg/{mongoStruct/bsonLookup.go => mongo_struct/bson_lookup.go} (96%) rename pkg/{mongoStruct/mongoStruct.go => mongo_struct/mongo_struct.go} (99%) rename pkg/{mongoStruct/gather.go => mongo_struct/populate.go} (92%) diff --git a/cmd/line.go b/logmower/lines.go similarity index 96% rename from cmd/line.go rename to logmower/lines.go index a44ed97..e9779f9 100644 --- a/cmd/line.go +++ b/logmower/lines.go @@ -4,7 +4,7 @@ import ( "log" "sync" - ms "git.k-space.ee/k-space/logmower-shipper/pkg/mongoStruct" + ms "git.k-space.ee/k-space/logmower-shipper/pkg/mongo_struct" prom "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" ) diff --git a/cmd/line_single.go b/logmower/lines_single.go similarity index 96% rename from cmd/line_single.go rename to logmower/lines_single.go index 6bd1f8c..d9e574a 100644 --- a/cmd/line_single.go +++ b/logmower/lines_single.go @@ -6,7 +6,7 @@ import ( "log" "time" - ms "git.k-space.ee/k-space/logmower-shipper/pkg/mongoStruct" + ms "git.k-space.ee/k-space/logmower-shipper/pkg/mongo_struct" prom "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" ) diff --git a/cmd/mongo.go b/logmower/mongo.go similarity index 98% rename from cmd/mongo.go rename to logmower/mongo.go index e7317cc..76b0746 100644 --- a/cmd/mongo.go +++ b/logmower/mongo.go @@ -7,7 +7,7 @@ import ( "net/url" "time" - ms "git.k-space.ee/k-space/logmower-shipper/pkg/mongoStruct" + ms "git.k-space.ee/k-space/logmower-shipper/pkg/mongo_struct" prom "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" mongoEvent "go.mongodb.org/mongo-driver/event" diff --git a/cmd/sender.go b/logmower/sender.go similarity index 97% rename from cmd/sender.go rename to logmower/sender.go index 9d34184..990ea39 100644 --- a/cmd/sender.go +++ b/logmower/sender.go @@ -5,7 +5,7 @@ import ( "log" "time" - ms "git.k-space.ee/k-space/logmower-shipper/pkg/mongoStruct" + ms "git.k-space.ee/k-space/logmower-shipper/pkg/mongo_struct" "github.com/jtagcat/util" prom "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/cmd/submitter.go b/logmower/submitter.go similarity index 98% rename from cmd/submitter.go rename to logmower/submitter.go index cac55ee..3847cfb 100644 --- a/cmd/submitter.go +++ b/logmower/submitter.go @@ -9,7 +9,7 @@ import ( "os" "time" - ms "git.k-space.ee/k-space/logmower-shipper/pkg/mongoStruct" + ms "git.k-space.ee/k-space/logmower-shipper/pkg/mongo_struct" "github.com/jtagcat/util" prom "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/cmd/watcher.go b/logmower/watcher.go similarity index 98% rename from cmd/watcher.go rename to logmower/watcher.go index 637da7e..5213b7a 100644 --- a/cmd/watcher.go +++ b/logmower/watcher.go @@ -10,7 +10,7 @@ import ( "sync" "time" - ms "git.k-space.ee/k-space/logmower-shipper/pkg/mongoStruct" + ms "git.k-space.ee/k-space/logmower-shipper/pkg/mongo_struct" "github.com/fsnotify/fsnotify" prom "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" @@ -20,6 +20,8 @@ import ( const DatabaseCommandTimeout = 10 * time.Second +const PrometheusPrefix = "logmower" // TODO: + // wrapper to force copying before use func defaultBackoff() wait.Backoff { return wait.Backoff{ diff --git a/cmd/main.go b/main.go similarity index 73% rename from cmd/main.go rename to main.go index 6b91261..e9409fd 100644 --- a/cmd/main.go +++ b/main.go @@ -1,4 +1,4 @@ -package logmower +package main import ( "errors" @@ -7,12 +7,12 @@ import ( "net/http" "os" + "git.k-space.ee/k-space/logmower-shipper/logmower" "github.com/prometheus/client_golang/prometheus/promhttp" ) -const PrometheusPrefix = "logmower" +const PrometheusPrefix = "logmower" // TODO: -// TODO: func main() { go func() { metricsPort := 2112 @@ -26,7 +26,7 @@ func main() { } }() - if err := App.Run(os.Args); err != nil { + if err := logmower.App.Run(os.Args); err != nil { log.Fatal(err) } } diff --git a/pkg/ctx_keys/ctx_keys.go b/pkg/ctx_keys/ctx_keys.go new file mode 100644 index 0000000..fb97d09 --- /dev/null +++ b/pkg/ctx_keys/ctx_keys.go @@ -0,0 +1,15 @@ +package ctx_keys + +// type Key uint32 + +// // The operations fsnotify can trigger; see the documentation on [Watcher] for a +// // full description, and check them with [Event.Has]. +// const ( +// PrometheusPrefix Key = 1 << iota +// ) + +// var keyMap = map[Key]reflect.Type{} + +// func get(ctx context.Context, key Key) (val any, ok bool) { +// ctx.Value() +// } diff --git a/pkg/mongoStruct/bsonLookup.go b/pkg/mongo_struct/bson_lookup.go similarity index 96% rename from pkg/mongoStruct/bsonLookup.go rename to pkg/mongo_struct/bson_lookup.go index cce381e..03f12d1 100644 --- a/pkg/mongoStruct/bsonLookup.go +++ b/pkg/mongo_struct/bson_lookup.go @@ -1,4 +1,4 @@ -package mongoStruct +package mongo_struct import ( "time" diff --git a/pkg/mongoStruct/mongoStruct.go b/pkg/mongo_struct/mongo_struct.go similarity index 99% rename from pkg/mongoStruct/mongoStruct.go rename to pkg/mongo_struct/mongo_struct.go index a9ab9a0..2fef52d 100644 --- a/pkg/mongoStruct/mongoStruct.go +++ b/pkg/mongo_struct/mongo_struct.go @@ -1,4 +1,4 @@ -package mongoStruct +package mongo_struct import ( "context" diff --git a/pkg/mongoStruct/gather.go b/pkg/mongo_struct/populate.go similarity index 92% rename from pkg/mongoStruct/gather.go rename to pkg/mongo_struct/populate.go index 35e7bda..2fa5dd8 100644 --- a/pkg/mongoStruct/gather.go +++ b/pkg/mongo_struct/populate.go @@ -1,4 +1,6 @@ -package mongoStruct +package mongo_struct + +// TODO: this is misc collection of stuff not really fitting in here import ( "fmt"