Merge pull request '5311-serverId_hostname' (!7) from 5311-serverId_hostname into master

Reviewed-on: #7

README.md

@@ -19,7 +19,15 @@ Build
 
 Create file named "config.local.yml" and put your private configuration:
 ```
-debug: true
+debug: false
+log: true
+dryPrint: false
+keepFile: false
+serverId: null
+concurrency: 4
+reconnectTimeout: 10
+refreshRate: 1000
+tmpDir: /dev/shm/printnatura
 db:
   host: localhost
   port: 3306
@@ -29,8 +37,7 @@ db:
 salix:
   url: http://localhost:3000
   user: user
-reconnectTimeout: 30
+  password: password
-refreshRate: 1000
 ```
 ## How to use
 

config.yml

@@ -2,7 +2,7 @@ debug: false
 log: true
 dryPrint: false
 keepFile: false
-serverId: 1
+serverId: null
 concurrency: 4
 reconnectTimeout: 10
 refreshRate: 1000

print-server.js

@@ -5,6 +5,7 @@ const path = require('path');
 const colors = require('colors');
 const axios = require('axios');
 const yml = require('require-yml');
+const os = require("os");
 
 const selectQuery = fs.readFileSync(`sql/selectQueued.sql`).toString();
 const jobDataQuery = fs.readFileSync(`sql/jobData.sql`).toString();
@@ -172,7 +173,7 @@ class PrintServer {
                         now(),
                         null,
                         null,
-                        this.conf.serverId,
+                        this.conf.serverId || os.hostname,
                         jobId
                     ]);
                     this.jobLog(jobId, 'debug', 'get: printing');