diff --git a/core/grpc/client/client.go b/core/grpc/client/client.go index 6df1ec08..ea774322 100644 --- a/core/grpc/client/client.go +++ b/core/grpc/client/client.go @@ -93,11 +93,11 @@ func (c *GrpcClient) WaitForReady() { select { case <-ticker.C: if c.IsReady() { - c.logger.Debugf("ready") + c.logger.Debugf("client is now ready") return } case <-c.stop: - c.logger.Errorf("stopped") + c.logger.Errorf("client has stopped") } } } diff --git a/core/task/handler/runner_test.go b/core/task/handler/runner_test.go index ffa451d2..a7251c39 100644 --- a/core/task/handler/runner_test.go +++ b/core/task/handler/runner_test.go @@ -36,7 +36,7 @@ func setupGrpc(t *testing.T) { require.Nil(t, err) // Start a gRPC client - err = client.GetGrpcClient().Start() + client.GetGrpcClient().Start() require.Nil(t, err) // Cleanup diff --git a/core/utils/config.go b/core/utils/config.go index adfc57aa..cc51f9d3 100644 --- a/core/utils/config.go +++ b/core/utils/config.go @@ -11,27 +11,27 @@ import ( ) const ( - DefaultWorkspace = "crawlab_workspace" - DefaultTaskLogPath = "/var/log/crawlab/tasks" - DefaultServerHost = "0.0.0.0" - DefaultServerPort = 8000 - DefaultGrpcHost = "localhost" - DefaultGrpcPort = 9666 - DefaultGrpcServerHost = "0.0.0.0" - DefaultGrpcServerPort = 9666 - DefaultAuthKey = "Crawlab2024!" - DefaultApiEndpoint = "http://localhost:8000" - DefaultApiAllowOrigin = "*" - DefaultApiAllowCredentials = "true" - DefaultApiAllowMethods = "DELETE, POST, OPTIONS, GET, PUT" - DefaultApiAllowHeaders = "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With" - DefaultApiPort = 8080 - DefaultApiPath = "/api" - DefaultNodeMaxRunners = 0 // 0 means no limit - DefaultDependencySetupScriptRoot = "/app/install" - MetadataConfigDirName = ".crawlab" - MetadataConfigName = "config.json" - PyenvRoot = "/root/.pyenv" + DefaultWorkspace = "crawlab_workspace" + DefaultTaskLogPath = "/var/log/crawlab/tasks" + DefaultServerHost = "0.0.0.0" + DefaultServerPort = 8000 + DefaultGrpcHost = "localhost" + DefaultGrpcPort = 9666 + DefaultGrpcServerHost = "0.0.0.0" + DefaultGrpcServerPort = 9666 + DefaultAuthKey = "Crawlab2024!" + DefaultApiEndpoint = "http://localhost:8000" + DefaultApiAllowOrigin = "*" + DefaultApiAllowCredentials = "true" + DefaultApiAllowMethods = "DELETE, POST, OPTIONS, GET, PUT" + DefaultApiAllowHeaders = "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With" + DefaultApiPort = 8080 + DefaultApiPath = "/api" + DefaultNodeMaxRunners = 0 // 0 means no limit + DefaultInstallRoot = "/app/install" + MetadataConfigDirName = ".crawlab" + MetadataConfigName = "config.json" + PyenvRoot = "/root/.pyenv" ) func IsDev() bool { @@ -245,9 +245,9 @@ func GetMetadataConfigPath() string { return filepath.Join(homeDirPath, MetadataConfigDirName, MetadataConfigName) } -func GetDependencySetupScriptRoot() string { - if res := viper.GetString("dependency.setupScriptRoot"); res != "" { +func GetInstallRoot() string { + if res := viper.GetString("install.root"); res != "" { return res } - return DefaultDependencySetupScriptRoot + return DefaultInstallRoot }