Changeset 96 for java/main/src/main/java/com/framsticks/communication/ServerConnection.java

Timestamp:

07/04/13 20:29:50 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• cleanup Instance management
  • extract Instance interface
  • extract Instance common algorithms to InstanceUtils?
• fix closing issues: Ctrl+C or window close button

properly shutdown whole program

• add tests regarding connecting to ObjectInstance? hosted

by Java Framsticks framework

• fix parsing and printing of all request types
• hide exception passing in special handle method of closures
  • substantially improve readability of closures
  • basically enable use of exception in asynchronous closures

(thrown exception is transported back to the caller)

• implement call request on both sides

CHANGELOG:
Further improve calling.

Improve instance calling.

Calling is working on both sides.

Improve exception handling in testing.

Waiters do not supercede other apllication exception being thrown.

Finished parsing and printing of all request types (with tests).

Move implementation and tests of request parsing to Request.

Add tests for Requests.

Improve waits in asynchronours tests.

Extract more algorithms to InstanceUtils?.

Extract Instance.resolve to InstanceUtils?.

Improve naming.

Improve passing exception in InstanceClient?.

Hide calling of passed functor in StateCallback?.

Hide Exception passing in asynchronous closures.

Hide exception passing in Future.

Make ResponseCallback? an abstract class.

Make Future an abstract class.

Minor change.

Move getPath to Path.to()

Move bindAccess to InstanceUtils?.

Extract common things to InstanceUtils?.

Fix synchronization bug in Connection.

Move resolve to InstanceUtils?.

Allow names of Joinable to be dynamic.

Add support for set request server side.

More fixes in communication.

Fix issues with parsing in connection.

Cut new line characters when reading.

More improvements.

Migrate closures to FramsticksException?.

Several changes.

Extract resolveAndFetch to InstanceUtils? algorithms.

Test resolving and fetching.

More fixes with function signature deduction.

Do not print default values in SimpleAbstractAccess?.

Add test of FramsClass? printing.

Improve FramsticksException? messages.

Add explicit dispatcher synchronization feature.

Rework assertions in tests.

Previous solution was not generic enough.

Allow addition of joinables to collection after start.

Extract SimulatorInstance? from RemoteInstance?.

Remove PrivateJoinableCollection?.

Improve connections.

Move shutdown hook to inside the Monitor.

It should work in TestNG tests, but it seems that
hooks are not called.

In ServerTest? client connects to testing server.

Move socket initialization to receiver thread.

Add proper closing on Ctrl+C (don't use signals).

Fix bugs with server accepting connections.

Merge Entity into Joinable.

Reworking ServerInstance?.

Extract more algorithm to InstanceUtils?.

Extract some common functionality from AbstractInstance?.

Functions were placed in InstanceUtils?.

Hide registry of Instance.

Use ValueParam? in Instance interface.

Minor change.

Extract Instance interface.

Old Instance is now AbstractInstance?.

File:

• java/main/src/main/java/com/framsticks/communication/ServerConnection.java (modified) (4 diffs)

java/main/src/main/java/com/framsticks/communication/ServerConnection.java

@@ -3 +3 @@
 import com.framsticks.communication.queries.*;
 import com.framsticks.params.SourceInterface;
+import com.framsticks.util.FramsticksException;
+import com.framsticks.util.lang.Holder;
 import com.framsticks.util.lang.Pair;
 import com.framsticks.util.lang.Strings;
+
+import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
@@ -20 +24 @@
 
         public ServerConnection(Socket socket, RequestHandler requestHandler) {
-                super("todo");
+                super(socket.getInetAddress().getHostAddress(), "server connection");
                 this.socket = socket;
                 this.requestHandler = requestHandler;
-                connected = true;
-
+                // socket.setSoTimeout(500);
+                setupStreams();
         }
 
-        @Override
-        public String toString() {
-                return socket.getInetAddress().getHostAddress();
-        }
 
         @Override
         protected void receiverThreadRoutine() {
-                while (connected) {
-                        processNextRequest();
+                while (isRunning() && isConnected()) {
+                        try {
+                                processNextRequest();
+                        } catch (Exception e) {
+                                log.log((isRunning() ? Level.ERROR : Level.DEBUG), "caught exception: ", e);
+                                break;
+                        }
                 }
+                interrupt();
+                finish();
         }
 
@@ -85 +92 @@
                                 output.print(outId);
                                 if (Strings.notEmpty(response.getComment())) {
-                                        output.print(' ');
+                                        output.print(" \"");
                                         output.print(response.getComment());
+                                        output.print('"');
                                 }
                                 output.print('\n');
@@ -96 +104 @@
 
         protected void processNextRequest() {
-                String line = getLine();
-                Pair<String, String> command = Strings.splitIntoPair(line, ' ', "\n");
-                final Pair<Integer, String> rest = parseRest(command.second);
-                if (rest == null) {
-                        respond(new Response(false, "\"invalid input\"", null), null);
+                final Holder<Integer> id = new Holder<>();
+                final String line = getLine();
+                try {
+                        Pair<CharSequence, CharSequence> command = Request.takeIdentifier(line);
+                        final Pair<Integer, CharSequence> rest = takeRequestId(command.second);
+                        id.set(rest.first);
+
+                        final Request request = Request.parse(command.first, rest.second);
+
+                        if (log.isTraceEnabled()) {
+                                log.trace("read request: " + request);
+                        }
+
+                        handleRequest(request, new ResponseCallback<ServerConnection>() {
+                                @Override
+                                public void process(Response response) {
+                                        respond(response, rest.first);
+                                }
+                        });
+                } catch (FramsticksException e) {
+                        e.arg("id", id.get()).arg("line", line);
+                        log.error("error: ", e);
+                        respond(new Response(false, "invalid input: " + e.getMsg(), null), id.get());
                         return;
                 }
 
-                final Request request = Request.createRequestByTypeString(command.first);
-                if (request == null) {
-                        respond(new Response(false, "\"invalid input\"", null), null);
-                        return;
-                }
-                request.parseRest(rest.second);
-                if (log.isTraceEnabled()) {
-                        log.trace("read request: " + request);
-                }
-
-                handleRequest(request, new ResponseCallback<ServerConnection>() {
-                        @Override
-                        public void process(Response response) {
-                                respond(response, rest.first);
-                        }
-                });
-        }
-
-        @Override
-        protected void joinableStart() {
-                // TODO Auto-generated method stub
-
         }
 }