failfast

Author: tonylau08

dcafe/pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.igeeksky</groupId>
 	<artifactId>dcafe</artifactId>
-	<version>0.9.8</version>
+	<version>0.9.9</version>
 	<name>dcafe</name>
 	<description>Distributed Increment ID Builder</description>
 	<packaging>jar</packaging>
@@ -37,7 +37,7 @@
 			<artifactId>slf4j-api</artifactId>
 			<version>${slf4j.version}</version>
 		</dependency>
-		<dependency>
+		<!-- <dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
 			<version>${slf4j.version}</version>
@@ -46,7 +46,7 @@
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
 			<version>${log4j.version}</version>
-		</dependency>
+		</dependency> -->
 	</dependencies>
 
 	<build>

dcafe/src/main/java/com/igeeksky/dcafe/keygen/snowflake/PrimaryKeyGen.java

@@ -1,6 +1,5 @@
 package com.igeeksky.dcafe.keygen.snowflake;
 
-import java.util.Random;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 

dcafe/src/main/java/com/igeeksky/dcafe/keygen/snowflake/TimeGenerator.java

@@ -21,7 +21,7 @@ public enum TimeGenerator {
 
 	private AbstractRMConfig config;
 	private long lastTimeMills;
-	private boolean isFail = true;
+	private volatile boolean isFail = true;
 	private int rmid = -1;
 
 	private final Lock rmidLock = new ReentrantLock();
@@ -61,17 +61,15 @@ long updateTime() {
 
 	/** 注册配置信息 */
 	public RegisterState registerRoomMachine(AbstractRMConfig config) {
+		isFail = true;
+		if (config == null) {
+			return RegisterState.ERROR;
+		}
+		if (config instanceof FailRMConfig) {
+			return RegisterState.FAIL;
+		}
 		try {
 			rmidLock.lock();
-			if (config == null) {
-				isFail = true;
-				return RegisterState.ERROR;
-			}
-			if (config instanceof FailRMConfig) {
-				isFail = true;
-				return RegisterState.FAIL;
-			}
-
 			this.config = config;
 			if (!updateRmid().equals(RegisterState.OK)) {
 				logger.error("registerRoomMachine error");
@@ -86,6 +84,7 @@ public RegisterState registerRoomMachine(AbstractRMConfig config) {
 				es.scheduleAtFixedRate(new TimeUpdater(), 0, timePeriod, TimeUnit.MILLISECONDS);
 				isRun = true;
 			}
+			isFail = false;
 		} finally {
 			rmidLock.unlock();
 		}
@@ -132,7 +131,6 @@ private RegisterState updateRmid() {
 
 		rmid = ((roomId << machineBitNum) ^ machineId) << 12;
 		lastTimeMills = (System.currentTimeMillis() << 23 >>> 1) ^ rmid;
-		isFail = false;
 		return RegisterState.OK;
 	}