lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
地平线
2015-04-17 16:57:02 +08:00
parent bba2766ee9
commit 282081cf95
9 changed files with 63 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/wentch/redkale/boot/Application.java
View File

@@ -93,7 +93,7 @@ public final class Application {
private final long startTime = System.currentTimeMillis();
private CountDownLatch cdl;
private CountDownLatch serverscdl;
private Application(final AnyValue config) {
this.config = config;
@@ -203,7 +203,7 @@ public final class Application {
final Application application = Application.create();
application.init();
application.factory.register(service);
new NodeHttpServer(application, new CountDownLatch(1), null).load(application.config);
new NodeHttpServer(application, new CountDownLatch(1), null).prepare(application.config);
application.factory.inject(service);
}
@@ -240,6 +240,7 @@ public final class Application {
try {
final DatagramChannel channel = DatagramChannel.open();
channel.configureBlocking(true);
channel.socket().setSoTimeout(3000);
channel.bind(new InetSocketAddress(config.getValue("host", "127.0.0.1"), config.getIntValue("port")));
boolean loop = true;
ByteBuffer buffer = ByteBuffer.allocateDirect(1024);
@@ -254,14 +255,13 @@ public final class Application {
long s = System.currentTimeMillis();
logger.info(application.getClass().getSimpleName() + " shutdowning");
application.shutdown();
application.cdl.countDown();
buffer.clear();
buffer.put("SHUTDOWN OK".getBytes());
buffer.flip();
channel.send(buffer, address);
long e = System.currentTimeMillis() - s;
logger.info(application.getClass().getSimpleName() + " shutdown in " + e + " ms");
Thread.sleep(100L);
application.serverscdl.countDown();
System.exit(0);
} catch (Exception ex) {
logger.log(Level.INFO, "SHUTDOWN FAIL", ex);
@@ -301,12 +301,12 @@ public final class Application {
public void start() throws Exception {
final AnyValue[] entrys = config.getAnyValues("server");
cdl = new CountDownLatch(entrys.length + 1);
this.serverscdl = new CountDownLatch(entrys.length + 1);
CountDownLatch timecd = new CountDownLatch(entrys.length);
runServers(timecd, entrys);
timecd.await();
logger.info(this.getClass().getSimpleName() + " started in " + (System.currentTimeMillis() - startTime) + " ms");
cdl.await();
this.serverscdl.await();
}
@SuppressWarnings("unchecked")
@@ -337,14 +337,13 @@ public final class Application {
}
servers.add(server);
server.load(entry); //必须在init之前
server.prepare(entry); //必须在init之前
server.init(entry);
server.start();
timecd.countDown();
} catch (Exception ex) {
logger.log(Level.WARNING, entry + " runServers error", ex);
} finally {
cdl.countDown();
serverscdl.countDown();
}
}
}.start();
@@ -519,11 +518,11 @@ public final class Application {
} catch (Exception t) {
logger.log(Level.WARNING, " shutdown server(" + server.getSocketAddress() + ") error", t);
} finally {
cdl.countDown();
serverscdl.countDown();
}
});
final StringBuilder sb = logger.isLoggable(Level.INFO) ? new StringBuilder() : null;
localServices.entrySet().parallelStream().forEach(k -> {
localServices.entrySet().stream().forEach(k -> {
Class x = k.getKey();
ServiceEntry y = k.getValue();
long s = System.currentTimeMillis();

4
src/com/wentch/redkale/boot/NodeHttpServer.java
View File

@@ -42,8 +42,8 @@ public final class NodeHttpServer extends NodeServer {
}
@Override
public void load(AnyValue config) throws Exception {
super.load(config);
public void prepare(AnyValue config) throws Exception {
super.prepare(config);
ClassFilter<HttpServlet> httpFilter = createHttpServletClassFilter(application.nodeName, config);
ClassFilter<Service> serviceFilter = createServiceClassFilter(application.nodeName, config);
long s = System.currentTimeMillis();

2
src/com/wentch/redkale/boot/NodeServer.java
View File

@@ -48,7 +48,7 @@ public abstract class NodeServer {
this.logger = Logger.getLogger(this.getClass().getSimpleName());
}
public void load(final AnyValue config) throws Exception {
public void prepare(final AnyValue config) throws Exception {
}
public void init(AnyValue config) throws Exception {

4
src/com/wentch/redkale/boot/NodeSncpServer.java
View File

@@ -37,8 +37,8 @@ public final class NodeSncpServer extends NodeServer {
}
@Override
public void load(AnyValue config) throws Exception {
super.load(config);
public void prepare(AnyValue config) throws Exception {
super.prepare(config);
ClassFilter<Service> serviceFilter = createServiceClassFilter(application.nodeName, config);
long s = System.currentTimeMillis();
ClassFilter.Loader.load(application.getHome(), serviceFilter);

36
src/com/wentch/redkale/source/DataJDBCSource.java
View File

@@ -565,32 +565,28 @@ public final class DataJDBCSource implements DataSource {
public <T> void delete(Class<T> clazz, Serializable... ids) {
Connection conn = createWriteSQLConnection();
try {
if (ids != null && ids.length == 1 && ids[0] != null && ids[0].getClass().isArray()) {
Class clz = ids[0].getClass();
if (clz == long[].class) {
long[] vs = (long[]) ids[0];
ids = new Serializable[vs.length];
for (int i = 0; i < vs.length; i++) {
ids[i] = vs[i];
}
} else if (clz == int[].class) {
int[] vs = (int[]) ids[0];
ids = new Serializable[vs.length];
for (int i = 0; i < vs.length; i++) {
ids[i] = vs[i];
}
}
}
delete(conn, clazz, ids);
} finally {
closeSQLConnection(conn);
}
}
@Override
public <T> void delete(Class<T> clazz, int[] ids) {
if (ids == null) return;
Serializable[] newids = new Serializable[ids.length];
for (int i = 0; i < ids.length; i++) {
newids[i] = ids[i];
}
delete(clazz, newids);
}
@Override
public <T> void delete(Class<T> clazz, long[] ids) {
if (ids == null) return;
Serializable[] newids = new Serializable[ids.length];
for (int i = 0; i < ids.length; i++) {
newids[i] = ids[i];
}
delete(clazz, newids);
}
/**
* 根据主键值删除对象， 必须是Entity Class
*

10
src/com/wentch/redkale/source/DataJPASource.java
View File

@@ -59,16 +59,6 @@ final class DataJPASource implements DataSource {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
@Override
public <T> void delete(Class<T> clazz, int[] ids) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
@Override
public <T> void delete(Class<T> clazz, long[] ids) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
private static class DataJPAConnection extends DataConnection {
private final EntityManager manager;

4
src/com/wentch/redkale/source/DataSource.java
View File

@@ -83,10 +83,6 @@ public interface DataSource {
*/
public <T> void delete(Class<T> clazz, Serializable... ids);
public <T> void delete(Class<T> clazz, int[] ids);
public <T> void delete(Class<T> clazz, long[] ids);
/**
* 根据主键值删除对象， 必须是Entity Class
*

2
src/com/wentch/redkale/source/EntityCache.java
View File

@@ -149,7 +149,7 @@ final class EntityCache<T> {
public void insert(T value) {
if (value == null) return;
T rs = needcopy ? reproduce.copy(this.creator.create(), value) : value; //确保同一主键值的map与list中的对象必须共用。
T rs = reproduce.copy(this.creator.create(), value); //确保同一主键值的map与list中的对象必须共用。
T old = this.map.put((Serializable) this.primary.get(rs), rs);
if (old != null) logger.log(Level.WARNING, "cache repeat insert data: " + value);
this.list.add(rs);