From 5d49371ef3f5cc1fa4d4fd6d5d84207520739037 Mon Sep 17 00:00:00 2001 From: Shulhan Date: Thu, 28 May 2020 22:14:46 +0700 Subject: server: make the listen port configurable through environment Deploying to App Engine require the port to be initialized through environment variable PORT. --- kbbi.go | 3 ++- server.go | 10 ++++++++-- telegram_bot.go | 9 ++++++++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/kbbi.go b/kbbi.go index c289722..dfc08c8 100644 --- a/kbbi.go +++ b/kbbi.go @@ -16,7 +16,8 @@ const ( loginURL = baseURL + "/Account/Login" entriPath = "/entri/" - defServerAPI = "https://kilabit.info/project/kbbi" + defServerAPI = "https://kamuskubot.df.r.appspot.com" + envPort = "PORT" pathAPIDefinisi = "/api/definisi" attrNameClass = "class" diff --git a/server.go b/server.go index e3ed460..ef7f930 100644 --- a/server.go +++ b/server.go @@ -49,9 +49,15 @@ type Server struct { // storage. // func NewServer(kamusStorage string) (server *Server, err error) { + address := defListen + port := os.Getenv(envPort) + if len(port) > 0 { + address = ":" + port + } + opts := &http.ServerOptions{ - Root: defRootDir, - Address: defListen, + Root: "", + Address: address, } if debug.Value > 0 { diff --git a/telegram_bot.go b/telegram_bot.go index e88b123..71adb94 100644 --- a/telegram_bot.go +++ b/telegram_bot.go @@ -8,6 +8,7 @@ import ( "bytes" "fmt" "log" + "os" "strings" "github.com/shuLhan/share/api/telegram/bot" @@ -47,12 +48,18 @@ func NewTelegramBot(token, webhookURL string) (tgbot *TelegramBot, err error) { Handler: tgbot.handleCommandStart, }} + address := defAddress + port := os.Getenv(envPort) + if len(port) > 0 { + address = ":" + port + } + opts := bot.Options{ Token: token, HandleUpdate: tgbot.handleUpdate, Webhook: &bot.Webhook{ URL: webhookURL, - ListenAddress: defAddress, + ListenAddress: address, }, } -- cgit v1.3