tileblaster 1.0.0 → 1.0.1

package/config.dist.js

@@ -3,7 +3,7 @@ const config = module.exports = {
 
 	id: "tileblaster", // id of the tileblaster instance, in case you want to run more than one; default: tileblaster
 
-	treads: 1, // number of worker threads in cluster, default: 1
+	threads: 1, // number of worker threads in cluster, default: 1
 	queue: 10, // number of parallel tile processes per worker, default: 12
 
 	server: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tileblaster",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "a quick and versatile map tile caching proxy",
   "main": "tileblaster.js",
   "bin": {

package/readme.md

@@ -70,8 +70,8 @@ server {
 		proxy_set_header Accept-Encoding $http_accept_encoding;
 		proxy_set_header Accept-Language $http_accept_language;
 		proxy_set_header Accept $http_accept;
-		proxy_set_header If-Modified-Since $http_if_modified_since
-		proxy_set_header If-None-Match $http_if_none_match
+		proxy_set_header If-Modified-Since $http_if_modified_since;
+		proxy_set_header If-None-Match $http_if_none_match;
 		proxy_http_version 1.1;
 		proxy_pass http://tileblaster;
 	}

package/tileblaster.js

@@ -177,10 +177,15 @@ tileblaster.prototype.shutdown = function(){
 	let closed = 0;
 	self.servers.forEach(function(server){
 		server.close(function(){
-			if (++closed === self.servers.length) {
-				debug.info("All Servers Closed");
-				process.exit(0);
-			}
+			(function(fn){
+				if (!server.socket) return fn();
+				fs.unlink(server.socket, fn);
+			})(function(){
+				if (++closed === self.servers.length) {
+					debug.info("All Servers Closed");
+					process.exit(0);
+				}
+			});
 		});
 	});
 	// watchdog
@@ -422,19 +427,38 @@ tileblaster.prototype.listen = function(router){
 
 		} else if (listen.socket) {
 
-			fs.unlink(listen.socket, function(err) { // try unlink leftover socket
-				if (err && err.code !== "ENOENT") return debug.error("Deleting socket '%s':", listen.socket, err);
-				server.listen(listen.socket, function(err) {
-					if (err) return debug.error("Binding to socket '%s':", listen.socket, err);
-					debug.info("Listening on socket '%s'", listen.socket);
-					self.servers.push(server);
-					if (listen.mode) fs.chmod(listen.socket, listen.mode, function(err){
-						if (err) return debug.error("Changing permissions of socket '%s' to '%s':", listen.socket, listen.perms.toString(8), err);
-					});
-					if (listen.group) fs.chown(listen.socket, os.userInfo().uid, listen.group, function(err){
-						if (err) return debug.error("Changing gid of socket '%s' to '%s':", listen.socket, listen.gid, err);
+			// create different sockets per instance
+			if (self.config.threads > 1) {
+				let ext = path.extname(listen.socket);
+				listen.socket = path.join(path.dirname(listen.socket), path.basename(listen.socket, ext) + self.config.id + ext);
+			}
+
+			// ensure socket dir exists
+			fs.mkdir(path.dirname(listen.socket), { recursive: true }, function(err){
+				if (err && err.code !== "ENOENT") return debug.error("Creating socket dir '%s':", path.dirname(listen.socket), err);
+
+				// inlink old socket
+				fs.unlink(listen.socket, function(err) { // try unlink leftover socket
+					if (err && err.code !== "ENOENT") return debug.error("Deleting socket '%s':", listen.socket, err);
+
+					server.listen(listen.socket, function(err) {
+						if (err) return debug.error("Binding to socket '%s':", listen.socket, err);
+
+						// store socket path
+						server.socket = listen.socket;
+
+						debug.info("Listening on socket '%s'", listen.socket);
+						self.servers.push(server);
+						if (listen.mode) fs.chmod(listen.socket, listen.mode, function(err){
+							if (err) return debug.error("Changing permissions of socket '%s' to '%s':", listen.socket, listen.perms.toString(8), err);
+						});
+						if (listen.group) fs.chown(listen.socket, os.userInfo().uid, listen.group, function(err){
+							if (err) return debug.error("Changing gid of socket '%s' to '%s':", listen.socket, listen.gid, err);
+						});
+
 					});
 				});
+
 			});
 
 		}