diff --git a/Gopkg.lock b/Gopkg.lock index 6b1c36b..d175796 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -3,7 +3,7 @@ [[projects]] branch = "master" - digest = "1:354e62d5acb9af138e13ec842f78a846d214a8d4a9f80e578698f1f1565e2ef8" + digest = "1:d64110a78451e373c5a952d2625323dbbe3bfe41c67f9652ea9668a6ceb4f645" name = "github.com/armon/go-metrics" packages = ["."] pruneopts = "" @@ -11,7 +11,7 @@ [[projects]] branch = "master" - digest = "1:b1b9627af19ee54d3ed6b069375f0e91baa4a25267cf3b684e80fdefb17f4719" + digest = "1:c0b6dbbb56a745020d5939bdde2197241a1c6109f226cca57b16f46916be5e94" name = "github.com/aws/aws-sdk-go" packages = [ "aws", @@ -53,14 +53,14 @@ [[projects]] branch = "master" - digest = "1:56b87c786a316d6e9b9c7ba8f3dd64e3199ca3b33a55cc596c633023bed20264" + digest = "1:e250643be8120824556f39df6ef128fc2be490fc96e0cb64b1a8ecf96bbe3ce6" name = "github.com/btcsuite/btcutil" packages = ["base58"] pruneopts = "" revision = "ab6388e0c60ae4834a1f57511e20c17b5f78be4b" [[projects]] - digest = "1:56c130d885a4aacae1dd9c7b71cfe39912c7ebc1ff7d2b46083c8812996dc43b" + digest = "1:0a39ec8bf5629610a4bc7873a92039ee509246da3cef1a0ea60f1ed7e5f9cea5" name = "github.com/davecgh/go-spew" packages = ["spew"] pruneopts = "" @@ -76,7 +76,7 @@ version = "v1.0.1" [[projects]] - digest = "1:858b7fe7b0f4bc7ef9953926828f2816ea52d01a88d72d1c45bc8c108f23c356" + digest = "1:d19c78214e03e297e9e30d2eb11892f731358b2951f2a5c7374658a156373e4c" name = "github.com/go-ini/ini" packages = ["."] pruneopts = "" @@ -85,7 +85,7 @@ [[projects]] branch = "master" - digest = "1:7150b23ba935d63f7b930d6c5ff20b52649ba623d62e0344971c822615fe57a3" + digest = "1:27b11ca1ad214ead955ff5480e8575e74c5df4e4dc02b04256a8d92131e1d3ad" name = "github.com/go-sql-driver/mysql" packages = ["."] pruneopts = "" @@ -108,7 +108,7 @@ version = "v1.6.2" [[projects]] - digest = "1:91aaeb45b3c10cc9cb68d1450cbc8ac77d0a677cf34a8ed3d4ef4dacb9df8a50" + digest = "1:b4817bdb0da3054166de058111943ac58b315aead2fed4ee838625a4e304f74c" name = "github.com/gorilla/rpc" packages = [ "v2", @@ -119,7 +119,7 @@ version = "v1.1.0" [[projects]] - digest = "1:64d212c703a2b94054be0ce470303286b177ad260b2f89a307e3d1bb6c073ef6" + digest = "1:fe1b4d4cbe48c0d55507c55f8663aa4185576cc58fa0c8be03bb8f19dfe17a9c" name = "github.com/gorilla/websocket" packages = ["."] pruneopts = "" @@ -144,7 +144,7 @@ [[projects]] branch = "master" - digest = "1:6396690228a7560bf9247cb90e5ae9c797bd630b01e7d2acab430bbca9a1ecb3" + digest = "1:6a611e691e739173805cb54019b5c39bb9d46455526dff31e0e6fe3aaca52776" name = "github.com/hashicorp/go-msgpack" packages = ["codec"] pruneopts = "" @@ -152,7 +152,7 @@ [[projects]] branch = "master" - digest = "1:0b5ca7d18e4ded1e4dacbb37ff027cb40a80c0fed969e4e03cf7aff129bc1b44" + digest = "1:deaebb4a98ca748bbad7eb653f3a675749500020823a086448ffcd7ba6b8b02d" name = "github.com/hashicorp/go-multierror" packages = ["."] pruneopts = "" @@ -160,7 +160,7 @@ [[projects]] branch = "master" - digest = "1:fd8ec2359315965bb6b84fd8e45cd5e8b58b80d8430dc96c8c5dfce46d30dbfc" + digest = "1:74f54e6ef2339f1de1e8c4b6674442118bd89e619b2fbd949ef2337330067994" name = "github.com/hashicorp/go-sockaddr" packages = ["."] pruneopts = "" @@ -175,7 +175,7 @@ revision = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3" [[projects]] - digest = "1:d2c45a353b65012162c7ca22c39b1b0bd06d39362fb375cf42b4e48e1104bfc6" + digest = "1:d7ce65372f495908f80fc1f80f4dab5d763d9a1de544abd95aa719e4262d0dd5" name = "github.com/hashicorp/memberlist" packages = ["."] pruneopts = "" @@ -184,7 +184,7 @@ [[projects]] branch = "master" - digest = "1:7b8e4a60bfdacc2a79ba4a4ef21b2e86e98fb1dc99d816179e0b4aee75106051" + digest = "1:4fd01ac3766b886665cfd335cc63819ec4e4538dcc1180c05d6edc089619962c" name = "github.com/hashicorp/serf" packages = [ "coordinate", @@ -202,12 +202,28 @@ version = "v1.0" [[projects]] - digest = "1:6f49eae0c1e5dab1dafafee34b207aeb7a42303105960944828c2079b92fc88e" + digest = "1:4f767a115bc8e08576f6d38ab73c376fc1b1cd3bb5041171c9e8668cc7739b52" name = "github.com/jmespath/go-jmespath" packages = ["."] pruneopts = "" revision = "0b12d6b5" +[[projects]] + branch = "master" + digest = "1:1e4cb5c6d4e92e2fb34f1545e071fb61e81c71fc0c325445db19b9f3981cb343" + name = "github.com/johntdyer/slack-go" + packages = ["."] + pruneopts = "" + revision = "95fac1160b220c5abcf8b0ef88e9c3cb213c09f4" + +[[projects]] + branch = "master" + digest = "1:132aae3fa5ad407b53f57cf6ebe274e414ec22d1700899023319931fa90b63e2" + name = "github.com/johntdyer/slackrus" + packages = ["."] + pruneopts = "" + revision = "f7aae3243a0786c5a974bce71ed951c459876e64" + [[projects]] branch = "master" digest = "1:65bb92382468ce7a1ee218b5f352cd0927d358569be7521dd7cb42e74589a308" @@ -218,7 +234,7 @@ [[projects]] branch = "master" - digest = "1:3e990fec1701f7cd3a301cb0fa824f65e35a37c224ff17f4d842720651d2f2fb" + digest = "1:76fd7507e6014c598a01f1b3d558774d2a3114c438403bc98123870d2aecec62" name = "github.com/lbryio/lbry.go" packages = [ "crypto", @@ -240,7 +256,7 @@ revision = "b7abd7672df533e627eddbf3a5a529786e8bda7f" [[projects]] - digest = "1:4c8d8358c45ba11ab7bb15df749d4df8664ff1582daead28bae58cf8cbe49890" + digest = "1:f0bad0fece0fb73c6ea249c18d8e80ffbe86be0457715b04463068f04686cf39" name = "github.com/miekg/dns" packages = ["."] pruneopts = "" @@ -248,7 +264,7 @@ version = "v1.0.8" [[projects]] - digest = "1:e6352ff4bd34c601567ad5e274837275f08e2a933e2688354cf5d44595c13ef9" + digest = "1:ba3b2eb0ae6fd3deac4386c02fe9d2279c9520738eb9db2f0667e74d5c7a0a61" name = "github.com/nlopes/slack" packages = ["."] pruneopts = "" @@ -257,7 +273,7 @@ [[projects]] branch = "master" - digest = "1:d38c630298ac75e214f3caa5c240ea2923c7a089824d175ba4107d0650d56579" + digest = "1:af967afd3cbc6b0145937f4dcab78bcd93e7b2f2b618fb2bcaf7069ad5c638fa" name = "github.com/phayes/freeport" packages = ["."] pruneopts = "" @@ -281,7 +297,7 @@ [[projects]] branch = "master" - digest = "1:56de39853758a4b6053a3f71e527305bbed11a0d876156e32e8cc7180d36198b" + digest = "1:1747c026a603e3c9f33f238e1d1390df2c8f48876b6bcb7a9c52c7b479e040f4" name = "github.com/sirupsen/logrus" packages = ["."] pruneopts = "" @@ -297,7 +313,7 @@ [[projects]] branch = "master" - digest = "1:c8f6919ab9f140506fd4ad3f4a9c9c2af9ee7921e190af0c67b2fca2f903083c" + digest = "1:b5212c335a490d958a6b1b5b48901b46e682b82fa9af3a238fa88df6eaa60873" name = "github.com/spf13/cobra" packages = ["."] pruneopts = "" @@ -313,7 +329,7 @@ [[projects]] branch = "master" - digest = "1:b7ef38166f9ee44c54ef992b2754950f73fa09daf30355bea7aa510f224c38a6" + digest = "1:f05efcac20bea32e1fcefde9a3cbefb07e02053666c4a67681ad18c8efc682d3" name = "github.com/uber-go/atomic" packages = ["."] pruneopts = "" @@ -321,7 +337,7 @@ [[projects]] branch = "master" - digest = "1:53c4b75f22ea7757dea07eae380ea42de547ae6865a5e3b41866754a8a8219c9" + digest = "1:16b935c128f178647036048862a21e8bfd66d1e83fb19787a8b356bdcf0de899" name = "golang.org/x/crypto" packages = [ "ed25519", @@ -335,7 +351,7 @@ [[projects]] branch = "master" - digest = "1:9f170ebb5ac75debb7e958e0388545441cc77de4d131a0c170530e948f3e857e" + digest = "1:15f2fc8cc79d90b0d4d712f04bd3eb3a3856ff3dd6b610a1425113ead3501610" name = "golang.org/x/net" packages = [ "bpf", @@ -350,7 +366,7 @@ [[projects]] branch = "master" - digest = "1:309d0f514b3f0dd143089ff4ab91c894d3e3f7e771c89b59d4b015b955cbaa5c" + digest = "1:e8f649ecfae7835a0a27ef39fd2180f6d3c12bc422e2ae55cd611f0b283b3e6e" name = "golang.org/x/sys" packages = [ "unix", @@ -368,7 +384,7 @@ revision = "fbb02b2291d28baffd63558aa44b4b56f178d650" [[projects]] - digest = "1:c1771ca6060335f9768dff6558108bc5ef6c58506821ad43377ee23ff059e472" + digest = "1:eede11c81b63c8f6fd06ef24ba0a640dc077196ec9b7a58ecde03c82eee2f151" name = "google.golang.org/appengine" packages = ["cloudsql"] pruneopts = "" @@ -376,7 +392,7 @@ version = "v1.1.0" [[projects]] - digest = "1:f771bf87a3253de520c2af6fb6e75314dce0fedc0b30b208134fe502932bb15d" + digest = "1:05eca53b271663de74078b5484b1995a8d56668a51434a698dc5d0863035d575" name = "gopkg.in/nullbio/null.v6" packages = ["convert"] pruneopts = "" @@ -399,6 +415,7 @@ "github.com/gorilla/rpc/v2", "github.com/gorilla/rpc/v2/json", "github.com/hashicorp/serf/serf", + "github.com/johntdyer/slackrus", "github.com/lbryio/errors.go", "github.com/lbryio/lbry.go/crypto", "github.com/lbryio/lbry.go/errors", diff --git a/Gopkg.toml b/Gopkg.toml index d0f1a96..c8739e0 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -33,3 +33,7 @@ [[constraint]] branch = "master" name = "github.com/phayes/freeport" + +[[constraint]] + branch = "master" + name = "github.com/johntdyer/slackrus" diff --git a/cmd/reflector.go b/cmd/reflector.go index 75e1326..ea52e17 100644 --- a/cmd/reflector.go +++ b/cmd/reflector.go @@ -7,6 +7,7 @@ import ( "syscall" "github.com/lbryio/reflector.go/db" + "github.com/lbryio/reflector.go/meta" "github.com/lbryio/reflector.go/reflector" "github.com/lbryio/reflector.go/store" @@ -24,6 +25,7 @@ func init() { } func reflectorCmd(cmd *cobra.Command, args []string) { + log.Printf("reflector version %s", meta.Version) db := new(db.SQL) err := db.Connect(globalConfig.DBConn) if err != nil { diff --git a/cmd/root.go b/cmd/root.go index adcb1ac..099ef22 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -9,6 +9,7 @@ import ( "github.com/lbryio/lbry.go/util" "github.com/lbryio/reflector.go/dht" + "github.com/johntdyer/slackrus" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) @@ -20,6 +21,7 @@ type Config struct { BucketRegion string `json:"bucket_region"` BucketName string `json:"bucket_name"` DBConn string `json:"db_conn"` + SlackHookURL string `json:"slack_hook_url"` } var verbose []string @@ -34,39 +36,9 @@ var conf string var globalConfig Config var rootCmd = &cobra.Command{ - Use: "prism", - Short: "Prism is a single entry point application with multiple sub modules which can be leveraged individually or together", - PersistentPreRun: func(cmd *cobra.Command, args []string) { - debugLogger := logrus.New() - debugLogger.SetLevel(logrus.DebugLevel) - - if util.InSlice(verboseAll, verbose) { - logrus.SetLevel(logrus.DebugLevel) - verbose = []string{verboseDHT, verboseNodeFinder} - } - - for _, debugType := range verbose { - switch debugType { - case verboseDHT: - dht.UseLogger(debugLogger) - case verboseNodeFinder: - dht.NodeFinderUseLogger(debugLogger) - } - } - - var err error - if conf == "" { - logrus.Errorln("--conf flag required") - os.Exit(1) - } else if conf != "none" { - globalConfig, err = loadConfig(conf) - if err != nil { - logrus.Error(err) - os.Exit(1) - } - } - }, - + Use: "prism", + Short: "Prism is a single entry point application with multiple sub modules which can be leveraged individually or together", + PersistentPreRun: preRun, // Uncomment the following line if your bare application // has an action associated with it: // Run: func(cmd *cobra.Command, args []string) { }, @@ -87,6 +59,51 @@ func Execute() { } } +func preRun(cmd *cobra.Command, args []string) { + debugLogger := logrus.New() + debugLogger.SetLevel(logrus.DebugLevel) + debugLogger.SetOutput(os.Stderr) + + if util.InSlice(verboseAll, verbose) { + logrus.SetLevel(logrus.DebugLevel) + verbose = []string{verboseDHT, verboseNodeFinder} + } + + for _, debugType := range verbose { + switch debugType { + case verboseDHT: + dht.UseLogger(debugLogger) + case verboseNodeFinder: + dht.NodeFinderUseLogger(debugLogger) + } + } + + var err error + if conf == "" { + logrus.Errorln("--conf flag required") + os.Exit(1) + } else if conf != "none" { + globalConfig, err = loadConfig(conf) + if err != nil { + logrus.Error(err) + os.Exit(1) + } + } + + if globalConfig.SlackHookURL != "" { + hook := &slackrus.SlackrusHook{ + HookURL: globalConfig.SlackHookURL, + AcceptedLevels: slackrus.LevelThreshold(logrus.InfoLevel), + Channel: "#reflector-logs", + //IconEmoji: ":ghost:", + //Username: "reflector.go", + } + //logrus.SetFormatter(&logrus.JSONFormatter{}) + logrus.AddHook(hook) + debugLogger.AddHook(hook) + } +} + func checkErr(err error) { if err != nil { panic(err) diff --git a/reflector/server.go b/reflector/server.go index 0bc7aa6..3251ee3 100644 --- a/reflector/server.go +++ b/reflector/server.go @@ -48,18 +48,18 @@ func NewServer(store store.BlobStore) *Server { // Shutdown shuts down the reflector server gracefully. func (s *Server) Shutdown() { - log.Debug("shutting down reflector server...") + log.Println("shutting down reflector server...") s.grp.StopAndWait() - log.Debug("reflector server stopped") + log.Println("reflector server stopped") } //Start starts the server to handle connections. func (s *Server) Start(address string) error { - log.Println("reflector listening on " + address) l, err := net.Listen(network, address) if err != nil { return errors.Err(err) } + log.Println("reflector listening on " + address) s.grp.Add(1) go func() { @@ -147,7 +147,7 @@ func (s *Server) handleConn(conn net.Conn) { func (s *Server) doError(conn net.Conn, err error) error { log.Errorln(errors.FullTrace(err)) if e2, ok := err.(*json.SyntaxError); ok { - log.Printf("syntax error at byte offset %d", e2.Offset) + log.Errorf("syntax error at byte offset %d", e2.Offset) } resp, err := json.Marshal(errorResponse{Error: err.Error()}) if err != nil { @@ -200,7 +200,7 @@ func (s *Server) receiveBlob(conn net.Conn) error { // this can also happen if the blob size is wrong, because the server will read the wrong number of bytes from the stream } - log.Println("Got blob " + blobHash[:8]) + log.Debugln("Got blob " + blobHash[:8]) if isSdBlob { err = s.store.PutSD(blobHash, blob)