GithubStar/neuron
1
0
Fork 0
mirror of https://github.com/emqx/neuron.git synced 2026-10-25 03:10:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1342 from fengzeroz/main

Browse Source 
chore(ci): ui version 2.5.0
This commit is contained in:
fengzeroz
2023-06-19 11:44:37 +08:00
committed by GitHub
parent fc24aefaac 99f294f244
commit 58c14e10d3
5 changed files with 2 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+1 -1
View File
@@ -9,7 +9,7 @@ on:
env:
VERSION: 2.6.0
UI_VERSION: 2.4.6
UI_VERSION: 2.5.0
BRANCH: main
jobs:
ft/resource/error.resource
-1
View File
@@ -16,7 +16,6 @@ ${NEU_ERR_FILE_NOT_EXIST} 1011
${NEU_ERR_INVALID_PASSWORD_LEN} 1012
${NEU_ERR_DUPLICATE_PASSWORD} 1013
${NEU_ERR_COMMAND_EXECUTION_FAILED} 1014
${NEU_ERR_INVALID_IP_ADDRESS} 1015
${NEU_ERR_NODE_EXIST} 2002
${NEU_ERR_NODE_NOT_EXIST} 2003
include/neuron/errcodes.h
-1
View File
@@ -45,7 +45,6 @@ typedef enum {
NEU_ERR_INVALID_PASSWORD_LEN = 1012,
NEU_ERR_DUPLICATE_PASSWORD = 1013,
NEU_ERR_COMMAND_EXECUTION_FAILED = 1014,
NEU_ERR_INVALID_IP_ADDRESS = 1015,
NEU_ERR_NODE_EXIST = 2002,
NEU_ERR_NODE_NOT_EXIST = 2003,
plugins/ekuiper/plugin_ekuiper.c
+1 -34
View File
@@ -17,10 +17,6 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
**/
#include <arpa/inet.h>
#include <netinet/in.h>
#include <sys/socket.h>
#include "errcodes.h"
#include "neuron.h"
#include "utils/asprintf.h"
@@ -131,8 +127,7 @@ static int ekuiper_plugin_start(neu_plugin_t *plugin)
if ((rv = nng_listen(plugin->sock, url, NULL, 0)) != 0) {
plog_error(plugin, "nng_listen: %s", nng_strerror(rv));
nng_close(plugin->sock);
rv = (NNG_EADDRINVAL == rv) ? NEU_ERR_INVALID_IP_ADDRESS
: NEU_ERR_EINTERNAL;
return NEU_ERR_EINTERNAL;
}
nng_recv_aio(plugin->sock, plugin->recv_aio);
@@ -168,12 +163,6 @@ static int parse_config(neu_plugin_t *plugin, const char *setting,
goto error;
}
struct in_addr addr;
if (0 == inet_aton(host.v.val_str, &addr)) {
plog_error(plugin, "inet_aton fail: %s", host.v.val_str);
goto error;
}
// port, required
if (0 == port.v.val_int || port.v.val_int > 65535) {
plog_error(plugin, "setting invalid port: %" PRIi64, port.v.val_int);
@@ -193,24 +182,6 @@ error:
return -1;
}
static inline int check_url_listenable(neu_plugin_t *plugin, const char *url)
{
int rv = nng_pair0_open(&plugin->sock);
if (0 != rv) {
plog_error(plugin, "nng_pair0_open: %s", nng_strerror(rv));
return NEU_ERR_EINTERNAL;
}
if (0 != (rv = nng_listen(plugin->sock, url, NULL, 0))) {
plog_error(plugin, "nng_listen: %s", nng_strerror(rv));
rv = (NNG_EADDRINVAL == rv) ? NEU_ERR_INVALID_IP_ADDRESS
: NEU_ERR_EINTERNAL;
}
nng_close(plugin->sock);
return rv;
}
static int ekuiper_plugin_config(neu_plugin_t *plugin, const char *setting)
{
int rv = 0;
@@ -230,10 +201,6 @@ static int ekuiper_plugin_config(neu_plugin_t *plugin, const char *setting)
goto error;
}
if (0 != (rv = check_url_listenable(plugin, url))) {
goto error;
}
plog_notice(plugin, "config success");
free(plugin->host);
src/utils/http.c
-1
View File
@@ -321,7 +321,6 @@ int neu_http_response(nng_aio *aio, neu_err_code_e code, char *content)
break;
case NEU_ERR_BODY_IS_WRONG:
case NEU_ERR_PARAM_IS_WRONG:
case NEU_ERR_INVALID_IP_ADDRESS:
case NEU_ERR_NODE_SETTING_INVALID:
case NEU_ERR_NODE_NOT_ALLOW_UPDATE:
case NEU_ERR_NODE_NOT_ALLOW_SUBSCRIBE: