@@ -3,86 +3,81 @@ package main
33import (
44 "database/sql"
55 "os"
6- "time"
6+ "os/signal"
7+ "syscall"
78
89 "github.com/evalphobia/logrus_sentry"
910 _ "github.com/lib/pq"
1011 "github.com/nyaruka/ezconf"
12+ indexer "github.com/nyaruka/rp-indexer"
1113 "github.com/nyaruka/rp-indexer/indexers"
1214 log "github.com/sirupsen/logrus"
1315)
1416
15- type config struct {
16- ElasticURL string `help:"the url for our elastic search instance"`
17- DB string `help:"the connection string for our database"`
18- Index string `help:"the alias for our contact index"`
19- Poll int `help:"the number of seconds to wait between checking for updated contacts"`
20- Rebuild bool `help:"whether to rebuild the index, swapping it when complete, then exiting (default false)"`
21- Cleanup bool `help:"whether to remove old indexes after a rebuild"`
22- LogLevel string `help:"the log level, one of error, warn, info, debug"`
23- SentryDSN string `help:"the sentry configuration to log errors to, if any"`
24- }
25-
2617func main () {
27- config := config {
28- ElasticURL : "http://localhost:9200" ,
29- DB : "postgres://localhost/temba?sslmode=disable" ,
30- Index : "contacts" ,
31- Poll : 5 ,
32- Rebuild : false ,
33- Cleanup : false ,
34- LogLevel : "info" ,
35- }
36- loader := ezconf .NewLoader (& config , "indexer" , "Indexes RapidPro contacts to ElasticSearch" , []string {"indexer.toml" })
18+ cfg := indexer .NewDefaultConfig ()
19+ loader := ezconf .NewLoader (cfg , "indexer" , "Indexes RapidPro contacts to ElasticSearch" , []string {"indexer.toml" })
3720 loader .MustLoad ()
3821
3922 // configure our logger
4023 log .SetOutput (os .Stdout )
4124 log .SetFormatter (& log.TextFormatter {})
4225
43- level , err := log .ParseLevel (config .LogLevel )
26+ level , err := log .ParseLevel (cfg .LogLevel )
4427 if err != nil {
4528 log .Fatalf ("Invalid log level '%s'" , level )
4629 }
4730 log .SetLevel (level )
4831
4932 // if we have a DSN entry, try to initialize it
50- if config .SentryDSN != "" {
51- hook , err := logrus_sentry .NewSentryHook (config .SentryDSN , []log.Level {log .PanicLevel , log .FatalLevel , log .ErrorLevel })
33+ if cfg .SentryDSN != "" {
34+ hook , err := logrus_sentry .NewSentryHook (cfg .SentryDSN , []log.Level {log .PanicLevel , log .FatalLevel , log .ErrorLevel })
5235 hook .Timeout = 0
5336 hook .StacktraceConfiguration .Enable = true
5437 hook .StacktraceConfiguration .Skip = 4
5538 hook .StacktraceConfiguration .Context = 5
5639 if err != nil {
57- log .Fatalf ("invalid sentry DSN: '%s': %s" , config .SentryDSN , err )
40+ log .Fatalf ("invalid sentry DSN: '%s': %s" , cfg .SentryDSN , err )
5841 }
5942 log .StandardLogger ().Hooks .Add (hook )
6043 }
6144
62- db , err := sql .Open ("postgres" , config .DB )
45+ db , err := sql .Open ("postgres" , cfg .DB )
6346 if err != nil {
64- log .Fatal ( err )
47+ log .Fatalf ( "unable to connect to database" )
6548 }
6649
67- ci := indexers .NewContactIndexer (config .ElasticURL , config .Index , 500 )
68-
69- for {
70- _ , err := ci .Index (db , config .Rebuild , config .Cleanup )
50+ idxrs := []indexers.Indexer {
51+ indexers .NewContactIndexer (cfg .ElasticURL , cfg .Index , 500 ),
52+ }
7153
72- if err != nil {
73- if config . Rebuild {
74- log . WithField ( " index" , config . Index ). WithError ( err ). Fatal ( "error during rebuilding" )
75- } else {
76- log . WithField ( "index" , config . Index ). WithError ( err ). Error ( "error during indexing" )
77- }
54+ if cfg . Rebuild {
55+ // if rebuilding, just do a complete index and quit. In future when we support multiple indexers,
56+ // the rebuild argument can be become the name of the index to rebuild, e.g. --rebuild=contacts
57+ idxr := idxrs [ 0 ]
58+ if _ , err := idxr . Index ( db , true , cfg . Cleanup ); err != nil {
59+ log . WithField ( "indexer" , idxr . Name ()). WithError ( err ). Fatal ( "error during rebuilding" )
7860 }
61+ } else {
62+ d := indexer .NewDaemon (cfg , db , idxrs )
63+ d .Start ()
7964
80- // if we were rebuilding then we're done
81- if config .Rebuild {
82- os .Exit (0 )
83- }
65+ handleSignals (d )
66+ }
67+ }
8468
85- // sleep a bit before starting again
86- time .Sleep (time .Second * 5 )
69+ // handleSignals takes care of trapping quit, interrupt or terminate signals and doing the right thing
70+ func handleSignals (d * indexer.Daemon ) {
71+ sigs := make (chan os.Signal , 1 )
72+ signal .Notify (sigs , syscall .SIGINT , syscall .SIGTERM , syscall .SIGQUIT )
73+
74+ for {
75+ sig := <- sigs
76+ switch sig {
77+ case syscall .SIGINT , syscall .SIGTERM , syscall .SIGQUIT :
78+ log .WithField ("signal" , sig ).Info ("received exit signal, exiting" )
79+ d .Stop ()
80+ return
81+ }
8782 }
8883}
0 commit comments