[MM-35470] Disable config watching logic (#17913)
* Disable config watching logic * Fix tests
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
b01f8ab0c8
Коммит
186475db3b
8
Makefile
8
Makefile
@@ -454,7 +454,7 @@ run-server: prepackaged-binaries validate-go-version start-docker ## Starts the
|
||||
@echo Running mattermost for development
|
||||
|
||||
mkdir -p $(BUILD_WEBAPP_DIR)/dist/files
|
||||
$(GO) run $(GOFLAGS) -ldflags '$(LDFLAGS)' $(PLATFORM_FILES) --disableconfigwatch 2>&1 | \
|
||||
$(GO) run $(GOFLAGS) -ldflags '$(LDFLAGS)' $(PLATFORM_FILES) 2>&1 | \
|
||||
$(GO) run $(GOFLAGS) -ldflags '$(LDFLAGS)' $(PLATFORM_FILES) logs --logrus $(RUN_IN_BACKGROUND)
|
||||
|
||||
debug-server: start-docker ## Compile and start server using delve.
|
||||
@@ -503,11 +503,11 @@ ifeq ($(BUILDER_GOOS_GOARCH),"windows_amd64")
|
||||
wmic process where "Caption='go.exe' and CommandLine like '%go.exe run%'" call terminate
|
||||
wmic process where "Caption='mattermost.exe' and CommandLine like '%go-build%'" call terminate
|
||||
else
|
||||
@for PID in $$(ps -ef | grep "[g]o run" | grep "disableconfigwatch" | awk '{ print $$2 }'); do \
|
||||
@for PID in $$(ps -ef | grep "[g]o run" | awk '{ print $$2 }'); do \
|
||||
echo stopping go $$PID; \
|
||||
kill $$PID; \
|
||||
done
|
||||
@for PID in $$(ps -ef | grep "[g]o-build" | grep "disableconfigwatch" | awk '{ print $$2 }'); do \
|
||||
@for PID in $$(ps -ef | grep "[g]o-build" | awk '{ print $$2 }'); do \
|
||||
echo stopping mattermost $$PID; \
|
||||
kill $$PID; \
|
||||
done
|
||||
@@ -536,7 +536,7 @@ restart-client: | stop-client run-client ## Restarts the webapp.
|
||||
|
||||
run-job-server: ## Runs the background job server.
|
||||
@echo Running job server for development
|
||||
$(GO) run $(GOFLAGS) -ldflags '$(LDFLAGS)' $(PLATFORM_FILES) jobserver --disableconfigwatch &
|
||||
$(GO) run $(GOFLAGS) -ldflags '$(LDFLAGS)' $(PLATFORM_FILES) jobserver &
|
||||
|
||||
config-ldap: ## Configures LDAP.
|
||||
@echo Setting up configuration for local LDAP
|
||||
|
||||
Ссылка в новой задаче
Block a user