diff options
| author | Corey Hulen <corey@hulen.com> | 2015-09-23 14:04:08 -0700 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-09-23 14:04:08 -0700 |
| commit | d792745f54463772472bec23b0caaae703eaddb3 (patch) | |
| tree | d98c966e0f273c5a6052e3c154bd7d75d091aa27 /api/server.go | |
| parent | 0170cfe604e6cfb430be0b6181243ca85a9ab27b (diff) | |
| parent | ccf2e6e4e74fc249a094c2c27de675644f1065cb (diff) | |
| download | chat-d792745f54463772472bec23b0caaae703eaddb3.tar.gz chat-d792745f54463772472bec23b0caaae703eaddb3.tar.bz2 chat-d792745f54463772472bec23b0caaae703eaddb3.zip | |
Merge pull request #752 from mattermost/PLT-11-email
PLT-11 Cleaned up config file and added ability to makes changes from the admin console.
Diffstat (limited to 'api/server.go')
| -rw-r--r-- | api/server.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api/server.go b/api/server.go index 3273e766c..3f23d8df6 100644 --- a/api/server.go +++ b/api/server.go @@ -38,11 +38,11 @@ func NewServer() { func StartServer() { l4g.Info("Starting Server...") - l4g.Info("Server is listening on " + utils.Cfg.ServiceSettings.Port) + l4g.Info("Server is listening on " + utils.Cfg.ServiceSettings.ListenAddress) var handler http.Handler = Srv.Router - if utils.Cfg.RateLimitSettings.UseRateLimiter { + if utils.Cfg.RateLimitSettings.EnableRateLimiter { l4g.Info("RateLimiter is enabled") vary := throttled.VaryBy{} @@ -71,7 +71,7 @@ func StartServer() { } go func() { - err := Srv.Server.ListenAndServe(":"+utils.Cfg.ServiceSettings.Port, handler) + err := Srv.Server.ListenAndServe(utils.Cfg.ServiceSettings.ListenAddress, handler) if err != nil { l4g.Critical("Error starting server, err:%v", err) time.Sleep(time.Second) |