From be1779c3c5f3347a7cc4cb143532c057ec10c8f8 Mon Sep 17 00:00:00 2001 From: Samuel El-Borai Date: Sun, 18 Mar 2018 20:54:43 +0100 Subject: [PATCH] Remove dependency on paked/configure from basic example --- examples/basic/config.json.example | 6 ------ examples/basic/main.go | 34 ++++++++++++++++++------------ 2 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 examples/basic/config.json.example diff --git a/examples/basic/config.json.example b/examples/basic/config.json.example deleted file mode 100644 index 264a73c..0000000 --- a/examples/basic/config.json.example +++ /dev/null @@ -1,6 +0,0 @@ -{ - "verify-token": "", - "should-verify": false, - "page-token": "", - "app-secret": "" -} diff --git a/examples/basic/main.go b/examples/basic/main.go index 4be7931..f86d6e0 100644 --- a/examples/basic/main.go +++ b/examples/basic/main.go @@ -1,29 +1,35 @@ package main import ( + "flag" "fmt" + "log" "net/http" + "os" "time" - "github.com/paked/configure" "github.com/paked/messenger" ) var ( - conf = configure.New() - verifyToken = conf.String("verify-token", "mad-skrilla", "The token used to verify facebook") - verify = conf.Bool("should-verify", false, "Whether or not the app should verify itself") - pageToken = conf.String("page-token", "not skrilla", "The token that is used to verify the page on facebook") - appSecret = conf.String("app-secret", "", "The app secret from the facebook developer portal") - port = conf.Int("port", 8080, "The port used to serve the messenger bot") + verifyToken = flag.String("verify-token", "mad-skrilla", "The token used to verify facebook (required)") + verify = flag.Bool("should-verify", false, "Whether or not the app should verify itself") + pageToken = flag.String("page-token", "not skrilla", "The token that is used to verify the page on facebook") + appSecret = flag.String("app-secret", "", "The app secret from the facebook developer portal (required)") + host = flag.String("host", "localhost", "The host used to serve the messenger bot") + port = flag.Int("port", 8080, "The port used to serve the messenger bot") ) func main() { - conf.Use(configure.NewFlag()) - conf.Use(configure.NewEnvironment()) - conf.Use(configure.NewJSONFromFile("config.json")) + flag.Parse() - conf.Parse() + if *verifyToken == "" || *appSecret == "" || *pageToken == "" { + fmt.Println("missing arguments") + fmt.Println() + flag.Usage() + + os.Exit(-1) + } // Create a new messenger client client := messenger.New(messenger.Options{ @@ -55,7 +61,7 @@ func main() { fmt.Println("Read at:", m.Watermark().Format(time.UnixDate)) }) - fmt.Printf("Serving messenger bot on localhost:%d\n", *port) - - http.ListenAndServe(fmt.Sprintf("localhost:%d", *port), client.Handler()) + addr := fmt.Sprintf("%s:%d", *host, *port) + log.Println("Serving messenger bot on", addr) + log.Fatal(http.ListenAndServe(addr, client.Handler())) }