Changeset 88 for java/main/src/main/java/com/framsticks/diagnostics/Diagnostics.java

Timestamp:

06/30/13 12:48:20 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• loading f0 schema with XmlLoader?
• use XmlLoader? to load configuration
• introduce unified fork-join model of various entities

(Instances, Connections, GUI Frames, etc.),
all those entities clean up gracefully on
shutdown, which may be initialized by user
or by some entity

• basing on above, simplify several organizing classes

(Observer, main class)

• add ExternalProcess? runner and it's extension: FramsServer?

(to host native frams server process from Java level)

CHANGELOG:
Remove redundant Observer class.

Clean up in AbstractJoinable?.

Update ExternalProcess? class to changes in joining model.

Another sweep through code with FindBugs?.

Find bug with not joining RemoteInstance?.

Joining almost works.

Much improved joining model.

More improvement to joining model.

Add logging messages around joinable operations.

Rename methods in AbstractJoinable?.

Improve Joinable.

Rewrite of entity structure.

More simplifications with entities.

Further improve joinables.

Let Frame compose from JFrame instead of inheriting.

Add join classes.

Improvements of closing.

Add Builder interface.

Add FramsServerTest?.xml

FramsServer? may be configured through xml.

Make Framsticks main class an Observer of Entities.

Make Observer a generic type.

Remove variables regarding to removed endpoint.

Simplify observer (remove endpoints).

More changes to Observer and Endpoint.

Minor improvements.

Add OutputListener? to ExternalProcess?.

Improve testing of ExternalProcess?.

Add ExternalProcess? runner.

Rename the Program class to Framsticks.

Migrate Program to use XmlLoader? configuration.

First steps with configuration using XmlLoader?.

Fix several bugs.

Move all f0 classes to apriopriate package.

XmlLoader? is able to load Schema.

XmlLoader? is loading classes and props.

Add GroupBuilder?.

File:

• java/main/src/main/java/com/framsticks/diagnostics/Diagnostics.java (modified) (2 diffs)

java/main/src/main/java/com/framsticks/diagnostics/Diagnostics.java

@@ -1 +1 @@
 package com.framsticks.diagnostics;
 
-import org.apache.commons.configuration.Configuration;
 
-import com.framsticks.observers.Endpoint;
-import com.framsticks.observers.Observer;
+import java.util.Date;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
+
+import org.apache.log4j.Logger;
+
+import com.framsticks.core.AbstractInstanceListener;
+import com.framsticks.core.Instance;
+import com.framsticks.dumping.PrintWriterSink;
+import com.framsticks.dumping.SaveStream;
+import com.framsticks.params.annotations.AutoAppendAnnotation;
+import com.framsticks.remote.RecursiveFetcher;
+import com.framsticks.util.Logging;
+import com.framsticks.util.PeriodicTask;
+import com.framsticks.util.StateFunctor;
+import com.framsticks.util.dispatching.JoinableCollection;
+import com.framsticks.util.io.Encoding;
 
 /**
  * @author Piotr Sniegowski
  */
-public class Diagnostics extends Observer {
+public class Diagnostics extends JoinableCollection<Instance> {
+        private static final Logger log =
+                Logger.getLogger(Diagnostics.class);
+
 
         Integer dumpsInterval;
@@ -19 +40 @@
         }
 
+
         @Override
-        public void configure(Configuration config) {
-                super.configure(config);
-                dumpsInterval = config.getInteger("dumps.interval", null);
-                dumpsPath = config.getString("dumps.path", null);
-                dumpsFormat = config.getString("dumps.format", null);
+        @AutoAppendAnnotation
+        public void add(final Instance instance) {
+                super.add(instance);
+
+                instance.addListener(new AbstractInstanceListener() {
+                        @Override
+                        public void onRun(Exception e) {
+                                if (e != null) {
+                                        return;
+                                }
+
+                                if (dumpsInterval != null) {
+                                        new PeriodicTask<Instance>(instance, dumpsInterval * 1000) {
+                                                @Override
+                                                public void run() {
+
+                                                        log.info("starting periodic dump");
+                                                        new RecursiveFetcher(instance, instance.getRootPath(), new StateFunctor() {
+                                                                @Override
+                                                                public void call(Exception e) {
+                                                                        if (Logging.log(log, "recursively fetch", instance, e)) {
+                                                                                again();
+                                                                                return;
+                                                                        }
+                                                                        log.info("instance resolved, saving");
+                                                                        try {
+                                                                                final String fileName = dumpsPath + "/" + instance + "_" + new SimpleDateFormat(dumpsFormat).format(new Date()) + ".param";
+                                                                                File file = new File(fileName);
+                                                                                new SaveStream(new PrintWriterSink(new PrintWriter(new OutputStreamWriter(new FileOutputStream(file), Encoding.getFramsticksCharset()))), instance, instance.getRootPath(), new StateFunctor() {
+                                                                                        @Override
+                                                                                        public void call(Exception e) {
+                                                                                                Logging.log(log, "periodic dump in " + fileName + " of", instance, e);
+                                                                                                again();
+                                                                                        }
+                                                                                });
+                                                                        } catch (IOException ex) {
+                                                                                log.info("failed to initiate dump: " + ex);
+                                                                                again();
+                                                                        }
+
+                                                                }
+                                                        });
+                                                }
+                                        };
+                                }
+                        }
+                });
+
+
+
         }
 
-
-        @Override
-        protected Endpoint createEndpoint() {
-                return new DiagnosticsEndpoint();
-        }
-
+        // @Override
+        // public void configure(Configuration config) {
+        //      super.configure(config);
+        //      dumpsInterval = config.getInteger("dumps.interval", null);
+        //      dumpsPath = config.getString("dumps.path", null);
+        //      dumpsFormat = config.getString("dumps.format", null);
+        // }
 
 }