xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

chore: cus name support in shellArgument (#20754) 

* chore: refactor cus prompt

* fix: client name in install.sh

* fix: -Wno-reserved-user-defined-literal

* fix: update taos-tools commit

* fix: include/os/osDir.h

* fix: check cus name

* fix: makepkg.sh

* chore: update taos-tools d194dc9

* fix: cus name

* fix: change adapter prefix

* fix: tools/*.sh

* fix: scripts

* fix: ../../packaging/tools/install_client.sh

* chore: cus domain in script

* fix: cus name in packaging/tools/install.sh

* fix: cus name in ../../packaging/tools/remove.sh

* fix: don't edit origin file

* fix: remove brand name

* fix: update taos-tools

* fix: cus name in log

* fix: compile error without cuc name

---------

Co-authored-by: chenhaoran <haoran920c@163.com>
This commit is contained in:
Shuduo Sang 2023-04-05 10:21:43 +08:00 committed by GitHub
parent 1261f9a24f
commit 33c5f1cf88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/taostools_CMakeLists.txt.in
View File

@ -2,7 +2,7 @@
# taos-tools
ExternalProject_Add(taos-tools
GIT_REPOSITORY https://github.com/taosdata/taos-tools.git
GIT_TAG 273a3fe
GIT_TAG 53d14fa
SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools"
BINARY_DIR ""
#BUILD_IN_SOURCE TRUE

17
source/dnode/mgmt/exe/dmMain.c
View File

@ -19,6 +19,21 @@
#include "tconfig.h"
#include "tglobal.h"
#if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL)
#include "cus_name.h"
#else
#ifndef CUS_NAME
#define CUS_NAME "TDengine"
#endif
#ifndef CUS_PROMPT
#define CUS_PROMPT "taos"
#endif
#ifndef CUS_EMAIL
#define CUS_EMAIL "<support@taosdata.com>"
#endif
#endif
// clang-format off
#define DM_APOLLO_URL "The apollo string to use when configuring the server, such as: -a 'jsonFile:./tests/cfg.json', cfg.json text can be '{\"fqdn\":\"td1\"}'."
#define DM_CFG_DIR "Configuration directory."
@ -228,7 +243,7 @@ static void dmDumpCfg() {
}
static int32_t dmInitLog() {
return taosCreateLog("taosdlog", 1, configDir, global.envCmd, global.envFile, global.apolloUrl, global.pArgs, 0);
return taosCreateLog(CUS_PROMPT"dlog", 1, configDir, global.envCmd, global.envFile, global.apolloUrl, global.pArgs, 0);
}
static void taosCleanupArgs() {

2
tools/shell/src/shellArguments.c
View File

@ -46,7 +46,7 @@
#define SHELL_VERSION "Print program version."
#ifdef WEBSOCKET
#define SHELL_DSN "Use dsn to connect to the TDengine cloud server or to a remote server which provides WebSocket connection."
#define SHELL_DSN "Use dsn to connect to the cloud server or to a remote server which provides WebSocket connection."
#define SHELL_REST "Use RESTful mode when connecting."
#define SHELL_TIMEOUT "Set the timeout for websocket query in seconds, default is 30."
#endif