Compare commits

..

No commits in common. "0b19a75d7b714b2c7d9a89fa488cf1dba2ebda2a" and "c84f11cd8f436580cfac4ec2e1e4425b91d054cf" have entirely different histories.

4 changed files with 7 additions and 36 deletions

3
.gitignore vendored
View File

@ -35,5 +35,4 @@ build/
.vscode/
### Mac OS ###
.DS_Store
/.idea/encodings.xml
.DS_Store

View File

@ -103,7 +103,7 @@
<arg>--gc=G1</arg>
<arg>--enable-url-protocols=https</arg>
<arg>-H:IncludeResources="simplelogger.properties"</arg>
<arg>--initialize-at-build-time=org.slf4j.simple.SimpleLogger,org.slf4j.simple.SimpleLoggerFactory,org.slf4j.simple.SimpleLoggerConfiguration</arg>
<arg>--initialize-at-build-time=org.slf4j.simple.SimpleLogger,org.slf4j.simple.SimpleLoggerFactory</arg>
<arg>-H:ReflectionConfigurationFiles=src/main/resources/reflect-config.json</arg>
</buildArgs>
<metadataRepository>

View File

@ -5,8 +5,6 @@ import cn.hutool.http.HttpResponse;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.Data;
import java.io.IOException;
import java.net.ServerSocket;
import java.util.concurrent.atomic.AtomicInteger;
@ -27,15 +25,4 @@ public class CustomUtil {
}
}
}
public static int _findIdlePort(int port) {
for(int i=port; i<65535; i++){
try(ServerSocket ignored = new ServerSocket(i)){
ignored.close();
return i;
}catch (IOException ignored) {
}
}
return -1;
}
}

View File

@ -54,8 +54,6 @@ public class storageNode {
counter = 0;
promises = new HashMap<>();
int real_port = CustomUtil._findIdlePort(26321);
channelFuture = new ServerBootstrap()
.channel(NioServerSocketChannel.class)
.group(new NioEventLoopGroup())
@ -66,25 +64,12 @@ public class storageNode {
channel.pipeline().addLast(new MessageCodec());
channel.pipeline().addLast(new MyChannelInboundHandlerAdapter(tempQueue));
}
}).bind(real_port);
log.info("listening on port {}", real_port);
})
.bind(26321);
int i;
for(i=0; i<=20; i++) {
try (Socket socket = new Socket()) {
socket.setSoTimeout(3000);
log.info("wake up main server on port {}", 26322 + i);
socket.connect(new InetSocketAddress("lionwebsite.xyz", 26322 + i));
byte[] bytes = socket.getInputStream().readAllBytes();
if(bytes.length > 0 && new String(bytes).equals("lionwebsite")) {
break;
}
} catch (Exception ignored) {
}
}
if (i==20) {
log.info("server connect failed");
}
try(Socket socket = new Socket()){
socket.connect(new InetSocketAddress("lionwebsite.xyz", 26322));
} catch (Exception ignored) {}
downloadCheckService = new DownloadCheckService(queue, promises);
checkThreadPool = Executors.newScheduledThreadPool(1);
checkThreadPool.scheduleAtFixedRate(this::mainThread, 5, 5, TimeUnit.SECONDS);