Explorar el Código

fix table T_DS_ALERT (#2854)

* fix worker group config no effect

* remove codehaus janino jar
the license about janino maybe not compatiable with Apache v2

* Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-1.3.0

# Conflicts:
#	dolphinscheduler-server/src/main/resources/config/install_config.conf

* datasource config

* Update datasource.properties

* fix RunConfig bug

* remove param monitor server state

* fix table T_DS_ALERT
dailidong hace 4 años
padre
commit
6886ed51c5

+ 1 - 4
dolphinscheduler-server/src/main/resources/config/install_config.conf

@@ -137,7 +137,4 @@ alertServer="ds3"
 
 # run api machine
 # note: list of machine hostnames for deploying api server
-apiServers="ds1"
-
-# whether to start monitoring self-starting scripts
-monitorServerState="false"
+apiServers="ds1"

+ 1 - 1
sql/dolphinscheduler-postgre.sql

@@ -191,7 +191,7 @@ CREATE TABLE t_ds_alert (
   content text ,
   alert_type int DEFAULT NULL ,
   alert_status int DEFAULT '0' ,
-  ·log· text ,
+  log text ,
   alertgroup_id int DEFAULT NULL ,
   receivers text ,
   receivers_cc text ,