diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-10-17 09:52:47 -0400 |
|---|---|---|
| committer | enahum <nahumhbl@gmail.com> | 2016-10-17 10:52:47 -0300 |
| commit | 3660f78733234ce7a8d477b7c043071af500259e (patch) | |
| tree | fb75d5bbf81c69aed4709736abf23d76fb58fb1b /Makefile | |
| parent | 219f4e36e5c78982317a85e8a49cda74562d6b65 (diff) | |
| download | chat-3660f78733234ce7a8d477b7c043071af500259e.tar.gz chat-3660f78733234ce7a8d477b7c043071af500259e.tar.bz2 chat-3660f78733234ce7a8d477b7c043071af500259e.zip | |
Re-enable console logging by default (#4210)
* Re-enable console logging by default
* Disable LogSettings.EnableConsole while packaging release
* Updated defaults in config.json to match the ones generated by the server
* Fixed make package and changed it to reduce the log level instead of disabling console logging entirely
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 21 |
1 files changed, 12 insertions, 9 deletions
@@ -121,16 +121,16 @@ stop-docker: echo stopping mattermost-postgres; \ docker stop mattermost-postgres > /dev/null; \ fi - + @if [ $(shell docker ps -a | grep -ci mattermost-openldap) -eq 1 ]; then \ echo stopping mattermost-openldap; \ docker stop mattermost-openldap > /dev/null; \ fi @if [ $(shell docker ps -a | grep -ci mattermost-webrtc) -eq 1 ]; then \ - echo stopping mattermost-webrtc; \ - docker stop mattermost-webrtc > /dev/null; \ - fi + echo stopping mattermost-webrtc; \ + docker stop mattermost-webrtc > /dev/null; \ + fi clean-docker: @echo Removing docker containers @@ -154,16 +154,16 @@ clean-docker: fi @if [ $(shell docker ps -a | grep -ci mattermost-webrtc) -eq 1 ]; then \ - echo removing mattermost-webrtc; \ - docker stop mattermost-webrtc > /dev/null; \ - docker rm -v mattermost-webrtc > /dev/null; \ - fi + echo removing mattermost-webrtc; \ + docker stop mattermost-webrtc > /dev/null; \ + docker rm -v mattermost-webrtc > /dev/null; \ + fi check-client-style: @echo Checking client style cd $(BUILD_WEBAPP_DIR) && $(MAKE) check-style - + check-server-style: @echo Running GOFMT $(eval GOFMT_OUTPUT := $(shell gofmt -d -s api/ model/ store/ utils/ manualtesting/ einterfaces/ mattermost.go 2>&1)) @@ -298,6 +298,9 @@ package: build build-client cp -RL templates $(DIST_PATH) cp -RL i18n $(DIST_PATH) + @# Disable developer settings + sed -i'' 's|"ConsoleLevel": "DEBUG",|"ConsoleLevel": "INFO",|g' $(DIST_PATH)/config/config.json; + @# Package webapp mkdir -p $(DIST_PATH)/webapp/dist cp -RL $(BUILD_WEBAPP_DIR)/dist $(DIST_PATH)/webapp |