demonized

.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 7 (MacOS X Default)"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

bin/com/gap/wallet/wallet.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>deamon settings</comment>
+<entry key="port">12345</entry>
+<entry key="path">d:/data</entry>
+<entry key="shutdown">12346</entry>
+</properties>

nodejs/env.cmd

@@ -1 +1 @@
-SET WALLET=C:\Users\yaroslav.gaponov\My Documents\GitHub\wallet\nodejs
+SET WALLET=/Users/yaroslav/projects/wallet/nodejs

nodejs/env.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+export WALLET=/Users/yaroslav/projects/wallet/nodejs

nodejs/etc/wallet.xml

@@ -3,6 +3,6 @@
 <properties>
 <comment>deamon settings</comment>
 <entry key="port">12345</entry>
-<entry key="path">C:\Users\yaroslav.gaponov\My Documents\GitHub\wallet\nodejs\data\</entry>
+<entry key="path">/Users/yaroslav/projects/wallet/nodejs/data</entry>
 <entry key="shutdown">12346</entry>
 </properties>

nodejs/lib/wallet.js

@@ -209,7 +209,7 @@ Wallet.prototype.onerror = function(callback) {
 
 var Frame = module.exports.Frame = function(command) {
     if (! Protocol[command]) {
-	throw new Error('This command is not supported.');
+	throw new Error('This command ' + command + ' is not supported.');
     }    
     if (this instanceof Frame) {
         this.command = command;

nodejs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wallet",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Wallet - nosql database server in java and client in nodejs",
   "main": "./lib/wallet.js",
   "directories": {

nodejs/start.cmd

@@ -1,2 +1 @@
-call env
 java -jar ./bin/wallet.jar start

nodejs/start.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-java -jar ./bin/wallet.jar 12345 ./data
+java -jar ./bin/wallet.jar start

nodejs/stop.cmd

@@ -1,2 +1 @@
-call env
 java -jar ./bin/wallet.jar stop

nodejs/stop.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+java -jar ./bin/wallet.jar stop

readme.md

@@ -1 +1 @@
-Wallet is high performance key-value database server in Java and client library in Node.JS========# Demo## Create demo databases`demo.sh` or `demo.cmd`## Run database server`start.sh` or `start.cmd`## Run examples`test.js` or `node test.js``test2.js` or `node test2.js``test3.js` or `node test3.js``test4.js` or `node test4.js`# Depending`java version 1.7`# Author`Yaroslav Gaponov`
+Wallet is high performance key-value database server in Java and client library in Node.JS========# Demo## Create demo databases`demo.sh` or `demo.cmd`## Set environment variable`Update and run env.sh or env.cmd script` ## Start database server`start.sh` or `start.cmd`## Run examples`test.js` or `node test.js``test2.js` or `node test2.js``test3.js` or `node test3.js``test4.js` or `node test4.js`## Stop database server`stop.sh` or `stop.cmd`# Depending`java version 1.7`# Author`Yaroslav Gaponov`

src/main/java/com/gap/wallet/Wallet.java

@@ -2,54 +2,64 @@
 
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.net.URISyntaxException;
+import java.util.InvalidPropertiesFormatException;
 import java.util.Properties;
 
-import com.gap.wallet.deamon.Daemon;
+import com.gap.wallet.core.WalletSocketServer;
+import com.gap.wallet.deamon.Daemonizer;
+
 
 public class Wallet {
 
-	public static void main(String[] args) throws IOException, URISyntaxException {
+	public static void main(String[] args) throws InvalidPropertiesFormatException, IOException {
 		System.out.println(Copyright.info);
-		System.out.println("wallet - demon");
-
-		String solutionPath = System.getenv("WALLET"); 
-
-		if (solutionPath == null) {
-			halt("Please set environment variable WALLET");
-		}
+		System.out.println("wallet - demon");	
 
-		FileInputStream fileConfig = new FileInputStream(solutionPath + "/etc/wallet.xml");
 	    Properties config = new Properties();
-	    config.loadFromXML(fileConfig);
-
+	    config.loadFromXML(new FileInputStream(System.getenv("WALLET") + "/etc/wallet.xml"));
+	    
 	    if (args.length > 0) {	    
 		    switch (args[0]) {
-		    case "run":
-		    	int port = Integer.parseInt(config.getProperty("port"));
-		    	String path = config.getProperty("path");
-		    	int shutdown =  Integer.parseInt(config.getProperty("shutdown"));
-		    	Daemon daemon = new Daemon(port, path, shutdown);
-				daemon.start();	    	
-		    case "start":
-		    	String java  = "java -jar";
-		    	String jar = solutionPath + "/bin/wallet.jar";
-		    	String command = "run";
-		    	System.out.println(String.format("%s %s %s", java, jar, command));
-		    	Runtime.getRuntime().exec(String.format("%s \"%s\" %s", java, jar, command));
-		    	break;
-		    case "stop":		    	
-		    	Daemon.stopDaemon(Integer.parseInt(config.getProperty("shutdown")));
-		    	break;
+			    case "start":
+			    	start();
+			    	break;
+
+			    case "stop":		    	
+			    	stop
+			    	(
+			    		Integer.parseInt(config.getProperty("shutdown"))
+			    	);
+			    	break;
+
+		    	default:
+		    		help();
 		    }
 	    }
 	    else {
-	    	halt("help: wallet [start|stop|run]");
+	    	run
+	    	(
+    			Integer.parseInt(config.getProperty("port")), 
+    			config.getProperty("path"), 
+    			Integer.parseInt(config.getProperty("shutdown"))
+	    	);
 	    }	    
 	}
 
-	private static void halt(String message) {
-		System.out.println(message);
+	private static void start() throws IOException {
+		Runtime.getRuntime().exec("java -jar " + System.getenv("WALLET") + "/bin/wallet.jar");
+	}
+
+	private static void run(int port,String path,int shutdown) throws IOException {	
+		Daemonizer.start(new WalletSocketServer(port, path), shutdown); 
+	}
+
+	private static void stop(int shutdown) {
+		Daemonizer.stop(shutdown);
+	}
+
+
+	private static void help() {
+		System.out.println("help: wallet [start|stop]");
 		System.exit(-1);
 	}
 

src/main/java/com/gap/wallet/core/WalletSocketServer.java

@@ -10,9 +10,10 @@
 import com.gap.wallet.net.Frame;
 import com.gap.wallet.net.SocketServer;
 import com.gap.wallet.storage.WalletClient;
+import com.gap.wallet.deamon.Service;
 import com.gap.wallet.exception.WalletException;
 
-public class WalletSocketServer extends SocketServer {
+public class WalletSocketServer extends SocketServer implements Service {
 
 	private final static int DEFAULT_PORT = 12345;
 	private final Map<String, WalletClient> sessions = new HashMap<String, WalletClient>();

src/main/java/com/gap/wallet/deamon/Daemonizer.java

@@ -0,0 +1,53 @@
+package com.gap.wallet.deamon;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.io.OutputStream;
+
+public class Daemonizer {
+
+	public static void start(final Service service, int shutdown) {		
+		// start service in separate thread
+		Thread threadService = new Thread(new Runnable() {
+			public void run() {
+				service.start();
+			}
+		});
+		threadService.start();
+
+		// start simple socket server for wait shutdown signal
+		ServerSocket serverSocket;
+		Socket clientSocket;
+		byte[] buf = new byte[8];
+		String cmd;
+		try {
+			serverSocket = new ServerSocket(shutdown);
+			do {
+				clientSocket = serverSocket.accept();
+				InputStream in = clientSocket.getInputStream();
+				in.read(buf);
+				in.close();
+				cmd = new String(buf);
+			} while (!cmd.equals("shutdown"));
+			service.stop();
+			clientSocket.close();
+		} catch (IOException e) {
+		}
+	}
+
+	public static void stop(int port) {
+		Socket clientSocket;
+		try {
+			clientSocket = new Socket("localhost", port);
+			OutputStream out = clientSocket.getOutputStream();
+			out.write(new String("shutdown").getBytes());
+			out.close();
+			clientSocket.close();
+		} catch (IOException e) {
+		}
+
+	}
+
+}

src/main/java/com/gap/wallet/deamon/Service.java

@@ -0,0 +1,6 @@
+package com.gap.wallet.deamon;
+
+public interface Service {
+	public void start();
+	public void stop();
+}

src/main/java/com/gap/wallet/net/SocketServer.java

@@ -5,13 +5,15 @@
 import java.nio.channels.*;
 import java.util.*;
 
+import com.gap.wallet.deamon.Service;
 import com.gap.wallet.logger.Log;
 
-public abstract class SocketServer {
+public abstract class SocketServer implements Service {
 	private final static int DEFAULT_BUFFER_SIZE = 16384; // max frame size!!! 
 	private final Selector selector;
 	private final ServerSocketChannel ssc;
 	private final int buffersize;
+	private static volatile boolean running = true;
 
 	public SocketServer(int port) throws IOException {
 		this(port, DEFAULT_BUFFER_SIZE);
@@ -28,12 +30,12 @@ public SocketServer(int port, int buffersize) throws IOException {
 		this.buffersize = buffersize;
 	}
 
-	public void start() throws IOException {
+	public void start() {
 		Log.logger.info("socket server is started");
 
 		try {									
-			while (true) {
-				int changes = selector.select();
+			while (running) {
+				int changes = selector.select(1000);
 
 				if (changes == 0) {
 					continue;
@@ -120,12 +122,12 @@ public void start() throws IOException {
 			}
 
 		} catch (IOException e) {
-			e.printStackTrace();
 		}
 	}
 
 	public void stop() {
 		Log.logger.info("socket server is stopping");
+		running = false;
 
 		Set<SelectionKey> keys = selector.selectedKeys();
 		Iterator<SelectionKey> it = keys.iterator();

src/main/java/com/gap/wallet/storage/Session.java

@@ -14,7 +14,7 @@ class Session {
 	private final static Map<String, Integer> clients = new HashMap<String, Integer>();
 
 	// blocking or nonblocking mode
-	private boolean blocking = false; 
+	private boolean blocking = true; 
 
 	// session variables
 	private final String storagefile;