diff options
author | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-13 23:20:27 -0500 |
---|---|---|
committer | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-13 23:20:27 -0500 |
commit | 4e4535bda9c7ce8609a2101037cda9a29407756c (patch) | |
tree | ed1fb75336261b24a30a85fea623e829c944b8d1 /cmd/platform | |
parent | bf1fdf92c71df29ddb7b0e31a00e218863c1158c (diff) | |
parent | 8b79f5d49cb8d4877e136a76e515edef41ef6f28 (diff) | |
download | chat-4e4535bda9c7ce8609a2101037cda9a29407756c.tar.gz chat-4e4535bda9c7ce8609a2101037cda9a29407756c.tar.bz2 chat-4e4535bda9c7ce8609a2101037cda9a29407756c.zip |
Merge release-4.7 with master in side branch
Diffstat (limited to 'cmd/platform')
-rw-r--r-- | cmd/platform/server.go | 2 | ||||
-rw-r--r-- | cmd/platform/server_test.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/platform/server.go b/cmd/platform/server.go index 1b411cf20..0421fcc05 100644 --- a/cmd/platform/server.go +++ b/cmd/platform/server.go @@ -93,7 +93,7 @@ func runServer(configFileLocation string, disableConfigWatch bool, interruptChan l4g.Critical(serverErr.Error()) return serverErr } - + api4.Init(a, a.Srv.Router, false) api3 := api.Init(a, a.Srv.Router) wsapi.Init(a, a.Srv.WebSocketRouter) diff --git a/cmd/platform/server_test.go b/cmd/platform/server_test.go index 15f9a357a..2b68fc703 100644 --- a/cmd/platform/server_test.go +++ b/cmd/platform/server_test.go @@ -69,4 +69,4 @@ func TestRunServerInvalidConfigFile(t *testing.T) { err = runServer(unreadableConfigFile.Name(), th.disableConfigWatch, th.interruptChan) require.Error(t, err) -} +}
\ No newline at end of file |