队列输出修改

o2server/configSample/node_127.0.0.1.json

@@ -94,6 +94,7 @@
     "statEnable": true,
     "statFilter": "mergeStat",
     "slowSqlMillis": 2000.0,
+    "lockTimeout": 120000.0,
     "###enable": "是否启用,如果没有可用的externalDataSources.json文件,那么默认会在节点中启用本地的H2数据库作为默认的数据库.###",
     "###tcpPort": "H2数据库jdbc连接端口,登录的用户名:sa,密码为xadmin的密码.数据库创建在/o2server/local/repository/data/X.mv.db,一旦数据库文件被创建,那么该数据库的密码被创建.###",
     "###webPort": "H2数据库web端口,H2提供一个web端的client,此端口为web端client的访问端口.用户名sa,密码为xadmin数据库初始创建的密码.###",
@@ -106,7 +107,8 @@
     "###maxIdle": "最大空闲连接数###",
     "###statEnable": "启用统计,默认启用###",
     "###statFilter": "统计方式配置,默认mergeStat###",
-    "###slowSqlMillis": "执行缓慢sql毫秒数,默认2000毫秒,执行缓慢的sql将被单独记录.###"
+    "###slowSqlMillis": "执行缓慢sql毫秒数,默认2000毫秒,执行缓慢的sql将被单独记录.###",
+    "###lockTimeout": "默认锁超时时间()毫秒).###"
   },
   "storage": {
     "enable": true,

o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/DataServer.java

@@ -20,6 +20,9 @@ public class DataServer extends ConfigObject {
 	private static final Boolean DEFAULT_STATENABLE = true;
 	private static final String DEFAULT_STATFILTER = "mergeStat";
 	private static final Integer DEFAULT_SLOWSQLMILLIS = 2000;
+	private static final Integer DEFAULT_LOCKTIMEOUT = 120000;
+
+	
 
 	public static DataServer defaultInstance() {
 		return new DataServer();
@@ -39,6 +42,7 @@ public class DataServer extends ConfigObject {
 		this.statEnable = DEFAULT_STATENABLE;
 		this.statFilter = DEFAULT_STATFILTER;
 		this.slowSqlMillis = DEFAULT_SLOWSQLMILLIS;
+		this.lockTimeout = DEFAULT_LOCKTIMEOUT;
 	}
 
 	@FieldDescribe("是否启用,如果没有可用的externalDataSources.json文件,那么默认会在节点中启用本地的H2数据库作为默认的数据库.")
@@ -67,6 +71,12 @@ public class DataServer extends ConfigObject {
 	private String statFilter;
 	@FieldDescribe("执行缓慢sql毫秒数,默认2000毫秒,执行缓慢的sql将被单独记录.")
 	private Integer slowSqlMillis;
+	@FieldDescribe("默认锁超时时间()毫秒).")
+	private Integer lockTimeout;
+	
+	public Integer getLockTimeout() {
+		return (null == this.lockTimeout || this.lockTimeout < 1) ? DEFAULT_LOCKTIMEOUT : this.lockTimeout;
+	}
 
 	public LogLevel getLogLevel() {
 		return this.logLevel == null ? LogLevel.WARN : this.logLevel;

o2server/x_base_core_project/src/main/java/com/x/base/core/project/queue/AbstractQueue.java

@@ -123,7 +123,6 @@ public abstract class AbstractQueue<T> {
 		try {
 			this.queue.clear();
 			queue.put(new StopSignal());
-			logger.info("queue class: {} stop.", className);
 		} catch (Exception e) {
 			e.printStackTrace();
 		} finally {

o2server/x_console/src/main/java/com/x/server/console/ResourceFactory.java

@@ -136,8 +136,9 @@ public class ResourceFactory {
 		for (Entry<String, DataServer> entry : Config.nodes().dataServers().entrySet()) {
 			DruidDataSourceC3P0Adapter dataSource = new DruidDataSourceC3P0Adapter();
 			String url = "jdbc:h2:tcp://" + entry.getKey() + ":" + entry.getValue().getTcpPort()
-					+ "/X;DEFAULT_LOCK_TIMEOUT=99999999;JMX=" + (entry.getValue().getJmxEnable() ? "TRUE" : "FALSE")
-					+ ";CACHE_SIZE=" + (entry.getValue().getCacheSize() * 1024);
+					+ "/X;DEFAULT_LOCK_TIMEOUT=" + entry.getValue().getLockTimeout() + ";JMX="
+					+ (entry.getValue().getJmxEnable() ? "TRUE" : "FALSE") + ";CACHE_SIZE="
+					+ (entry.getValue().getCacheSize() * 1024);
 			dataSource.setJdbcUrl(url);
 			dataSource.setDriverClass(SlicePropertiesBuilder.driver_h2);
 			dataSource.setPreferredTestQuery(SlicePropertiesBuilder.validationQueryOfUrl(url));
@@ -165,8 +166,9 @@ public class ResourceFactory {
 			BasicDataSource dataSource = new BasicDataSource();
 
 			String url = "jdbc:h2:tcp://" + entry.getKey() + ":" + entry.getValue().getTcpPort()
-					+ "/X;DEFAULT_LOCK_TIMEOUT=99999999;JMX=" + (entry.getValue().getJmxEnable() ? "TRUE" : "FALSE")
-					+ ";CACHE_SIZE=" + (entry.getValue().getCacheSize() * 1024);
+					+ "/X;DEFAULT_LOCK_TIMEOUT=" + entry.getValue().getLockTimeout() + ";JMX="
+					+ (entry.getValue().getJmxEnable() ? "TRUE" : "FALSE") + ";CACHE_SIZE="
+					+ (entry.getValue().getCacheSize() * 1024);
 			dataSource.setDriverClassName(SlicePropertiesBuilder.driver_h2);
 			dataSource.setUrl(url);
 			dataSource.setInitialSize(0);
@@ -189,8 +191,9 @@ public class ResourceFactory {
 		for (Entry<String, DataServer> entry : Config.nodes().dataServers().entrySet()) {
 			DruidDataSource dataSource = new DruidDataSource();
 			String url = "jdbc:h2:tcp://" + entry.getKey() + ":" + entry.getValue().getTcpPort()
-					+ "/X;DEFAULT_LOCK_TIMEOUT=99999999;JMX=" + (entry.getValue().getJmxEnable() ? "TRUE" : "FALSE")
-					+ ";CACHE_SIZE=" + (entry.getValue().getCacheSize() * 1024);
+					+ "/X;DEFAULT_LOCK_TIMEOUT=" + entry.getValue().getLockTimeout() + ";JMX="
+					+ (entry.getValue().getJmxEnable() ? "TRUE" : "FALSE") + ";CACHE_SIZE="
+					+ (entry.getValue().getCacheSize() * 1024);
 			dataSource.setDriverClassName(SlicePropertiesBuilder.driver_h2);
 			dataSource.setUrl(url);
 			dataSource.setInitialSize(0);