new module is added

DeshanKTD · Sep 25, 2017 · 7775a93 · 7775a93
1 parent 4d0ddd6
commit 7775a93
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 5 deletions.
diff --git a/dummyservice/pom.xml b/dummyservice/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>serverless_architecture</artifactId>
+        <groupId>org.pera</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>dummy-service</artifactId>
+
+
+</project>
diff --git a/...src/main/java/lambda/netty/loadbalancer/core/SysService/SysServiceHostResolveHandler.java b/...src/main/java/lambda/netty/loadbalancer/core/SysService/SysServiceHostResolveHandler.java
@@ -100,6 +100,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
                     ctx.fireUserEventTriggered(proxyEvent);
                 } else if (stateImpl.getState() == InstanceStates.RUNNING) {
                     logger.info("These instances are up and running");
+                    System.out.println(stateImpl.getOSVInstance().peek().getHost());
                     String remoteIp = LoadBalanceUtil.getRemoteHost(stateImpl);
                     try {
                         EtcdUtil.putValue(instanceID, StateImplJsonHelp.toString(stateImpl));

diff --git a/lambdanettyloadbalancer/src/main/java/lambda/netty/loadbalancer/core/launch/Launcher.java b/lambdanettyloadbalancer/src/main/java/lambda/netty/loadbalancer/core/launch/Launcher.java
@@ -110,7 +110,7 @@ public static void main(String[] args) throws InterruptedException, EtcdClientEx
 //        osvInstance.setHost("127.0.0.1:8082");
 //        osvInstance.setUuid(new UUID(1,1));
 //        state.pushOSVInstance(osvInstance);
-//        state.setState(InstanceStates.DOWN);
+//        state.setState(InstanceStates.RUNNING);
 //        state.setDomain("localhost");
 //
 //        System.out.println(StateImplJsonHelp.toString(state));
@@ -124,7 +124,7 @@ public static void main(String[] args) throws InterruptedException, EtcdClientEx
 //        } catch (ExecutionException e) {
 //            e.printStackTrace();
 //        }
-//
+
         try {
             ConfigLogger.printFields();
         } catch (Exception e) {

diff --git a/...cer/src/main/java/lambda/netty/loadbalancer/core/loadbalance/statemodels/OSVInstance.java b/...cer/src/main/java/lambda/netty/loadbalancer/core/loadbalance/statemodels/OSVInstance.java
@@ -8,7 +8,6 @@ public class OSVInstance {
     UUID uuid;
     String ipaddress;
     String host;
-    static String port = Launcher.getString(ConfigConstants.CONFIG_SERVICES_DEFAULT_PORT );
 
     public UUID getUuid() {
         return uuid;
@@ -23,7 +22,11 @@ public void setUuid(UUID uuid) {
     public void setIpaddress(String ipaddress) { this.ipaddress = ipaddress;}
 
     public String getHost() {
-        return this.ipaddress +":"+ port;
+        return host;
     }
 
+
+    public void setHost(String host) {
+        this.host = host;
+    }
 }
diff --git a/lambdasystemservice/src/main/java/api/loadbalance/InstanceStateManager.java b/lambdasystemservice/src/main/java/api/loadbalance/InstanceStateManager.java
@@ -69,7 +69,7 @@ public FullHttpResponse process(FullHttpRequest fullHttpRequest) {
         remoteIp="127.0.0.1:"+8082;
 
         //implementation of instance spawning
-
+        System.out.println(remoteIp);
         ByteBuf content = Unpooled.copiedBuffer("Hello World.", CharsetUtil.UTF_8);
         FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1,
                 remoteIp!=null? HttpResponseStatus.OK:HttpResponseStatus.SERVICE_UNAVAILABLE, content);

diff --git a/pom.xml b/pom.xml
@@ -11,6 +11,7 @@
         <module>lambdanettyloadbalancer</module>
         <module>lambdasystemservice</module>
         <module>lambdacli</module>
+        <module>dummyservice</module>
     </modules>
     <packaging>pom</packaging>