From 9c0cd58410a0a9c855ec26e5e155b61a9d94b158 Mon Sep 17 00:00:00 2001 From: marvzhang Date: Wed, 11 Mar 2020 07:22:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dhostname=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/services/register/register.go | 3 ++- docker-compose.yml | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/backend/services/register/register.go b/backend/services/register/register.go index 8169ae65..9791453e 100644 --- a/backend/services/register/register.go +++ b/backend/services/register/register.go @@ -10,6 +10,7 @@ import ( "os/exec" "reflect" "runtime/debug" + "strings" "sync" ) @@ -145,7 +146,7 @@ func getHostname() (string, error) { return "", err } - return stdout.String(), nil + return strings.Replace(stdout.String(), "\n", "", -1), nil } // ===================== 获得注册简单工厂 ===================== diff --git a/docker-compose.yml b/docker-compose.yml index e9993ef4..e937c9f5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,11 +22,13 @@ services: # CRAWLAB_SERVER_REGISTER_TYPE: "mac" # node register type 节点注册方式. 默认为 mac 地址，也可设置为 ip（防止 mac 地址冲突） # CRAWLAB_SERVER_REGISTER_IP: "127.0.0.1" # node register ip 节点注册IP. 节点唯一识别号，只有当 CRAWLAB_SERVER_REGISTER_TYPE 为 "ip" 时才生效 # CRAWLAB_TASK_WORKERS: 8 # number of task executors 任务执行器个数（并行执行任务数） - # CRAWLAB_RPC_WORKERS: 16 # number of RPC workers RPC 工作协程个数 # CRAWLAB_SERVER_LANG_NODE: "Y" # whether to pre-install Node.js 预安装 Node.js 语言环境 # CRAWLAB_SERVER_LANG_JAVA: "Y" # whether to pre-install Java 预安装 Java 语言环境 + # CRAWLAB_SERVER_LANG_DOTNET: "Y" # whether to pre-install .Net core 预安装 .Net Core 语言环境 + # CRAWLAB_SERVER_LANG_PHP: "Y" # whether to pre-install PHP 预安装 PHP 语言环境 # CRAWLAB_SETTING_ALLOWREGISTER: "N" # whether to allow user registration 是否允许用户注册 # CRAWLAB_SETTING_ENABLETUTORIAL: "N" # whether to enable tutorial 是否启用教程 + # CRAWLAB_SETTING_RUNONMASTER: "N" # whether to run on master node 是否在主节点上运行任务 # CRAWLAB_NOTIFICATION_MAIL_SERVER: smtp.exmaple.com # STMP server address STMP 服务器地址 # CRAWLAB_NOTIFICATION_MAIL_PORT: 465 # STMP server port STMP 服务器端口 # CRAWLAB_NOTIFICATION_MAIL_SENDEREMAIL: admin@exmaple.com # sender email 发送者邮箱