From c699e66a5d4e9cdd7e113f0edb7eb6710d1b58da Mon Sep 17 00:00:00 2001
From: Matt <zone117x@gmail.com>
Date: Sat, 29 Mar 2014 19:59:22 -0600
Subject: [PATCH] Better mpos/mysql logging. Added maxcoin config.

---
 coins/maxcoin.json                |  6 ++++
 libs/mposCompatibility.js         | 19 +++++++------
 libs/paymentProcessor.js          |  2 +-
 pool_configs/maxcoin_example.json | 47 +++++++++++++++++++++++++++++++
 4 files changed, 64 insertions(+), 10 deletions(-)
 create mode 100644 coins/maxcoin.json
 create mode 100644 pool_configs/maxcoin_example.json

diff --git a/coins/maxcoin.json b/coins/maxcoin.json
new file mode 100644
index 0000000..bd90799
--- /dev/null
+++ b/coins/maxcoin.json
@@ -0,0 +1,6 @@
+{
+    "name"       : "Maxcoin",
+    "symbol"     : "MAX",
+    "algorithm"  : "keccak",
+    "txMessages" : false
+}
\ No newline at end of file
diff --git a/libs/mposCompatibility.js b/libs/mposCompatibility.js
index 2417ca3..4b75adb 100644
--- a/libs/mposCompatibility.js
+++ b/libs/mposCompatibility.js
@@ -7,7 +7,8 @@ module.exports = function(logger, poolConfig){
 
     var connection;
 
-    var logIdentify = 'MPOS';
+    var logIdentify = 'MySQL';
+    var logComponent = coin;
 
     function connect(){
         connection = mysql.createConnection({
@@ -19,18 +20,18 @@ module.exports = function(logger, poolConfig){
         });
         connection.connect(function(err){
             if (err)
-                logger.error(logIdentify, 'mysql', 'Could not connect to mysql database: ' + JSON.stringify(err))
+                logger.error(logIdentify, logComponent, 'Could not connect to mysql database: ' + JSON.stringify(err))
             else{
-                logger.debug(logIdentify, 'mysql', 'Successful connection to MySQL database');
+                logger.debug(logIdentify, logComponent, 'Successful connection to MySQL database');
             }
         });
         connection.on('error', function(err){
             if(err.code === 'PROTOCOL_CONNECTION_LOST') {
-                logger.warning(logIdentify, 'mysql', 'Lost connection to MySQL database, attempting reconnection...');
+                logger.warning(logIdentify, logComponent, 'Lost connection to MySQL database, attempting reconnection...');
                 connect();
             }
             else{
-                logger.error(logIdentify, 'mysql', 'Database error: ' + JSON.stringify(err))
+                logger.error(logIdentify, logComponent, 'Database error: ' + JSON.stringify(err))
             }
         });
     }
@@ -43,7 +44,7 @@ module.exports = function(logger, poolConfig){
             [workerName],
             function(err, result){
                 if (err){
-                    logger.error(logIdentify, 'mysql', 'Database error when authenticating worker: ' +
+                    logger.error(logIdentify, logComponent, 'Database error when authenticating worker: ' +
                         JSON.stringify(err));
                     authCallback(false);
                 }
@@ -76,9 +77,9 @@ module.exports = function(logger, poolConfig){
             dbData,
             function(err, result) {
                 if (err)
-                    logger.error(logIdentify, 'mysql', 'Insert error when adding share: ' + JSON.stringify(err));
+                    logger.error(logIdentify, logComponent, 'Insert error when adding share: ' + JSON.stringify(err));
                 else
-                    logger.debug(logIdentify, 'mysql', 'Share inserted');
+                    logger.debug(logIdentify, logComponent, 'Share inserted');
             }
         );
     };
@@ -89,7 +90,7 @@ module.exports = function(logger, poolConfig){
             'UPDATE `pool_worker` SET `difficulty` = ' + diff + ' WHERE `username` = ' + connection.escape(workerName),
             function(err, result){
                 if (err)
-                    logger.error(logIdentify, 'mysql', 'Error when updating worker diff: ' +
+                    logger.error(logIdentify, logComponent, 'Error when updating worker diff: ' +
                         JSON.stringify(err));
                 else if (result.affectedRows === 0){
                     connection.query('INSERT INTO `pool_worker` SET ?', {username: workerName, difficulty: diff});
diff --git a/libs/paymentProcessor.js b/libs/paymentProcessor.js
index 953cc6c..2f2f25c 100644
--- a/libs/paymentProcessor.js
+++ b/libs/paymentProcessor.js
@@ -48,7 +48,7 @@ function SetupForPool(logger, poolOptions){
         logger.error(logSystem, logComponent, 'Failed to connect to daemon for payment processing: ' +
             JSON.stringify(error));
     }).on('error', function(error){
-        logger.error(logSystem, logComponent);
+        logger.error(logSystem, logComponent, 'Daemon error ' + JSON.stringify(error));
     }).init();
 
 
diff --git a/pool_configs/maxcoin_example.json b/pool_configs/maxcoin_example.json
new file mode 100644
index 0000000..9319189
--- /dev/null
+++ b/pool_configs/maxcoin_example.json
@@ -0,0 +1,47 @@
+{
+    "enabled": false,
+    "coin": "maxcoin.json",
+
+    "address": "tKWkadAkT2vqK6v2PHLJmV1RTVvF7XZEgN",
+    "blockRefreshInterval": 1000,
+    "txRefreshInterval": 20000,
+    "connectionTimeout": 600,
+
+    "shareProcessing": {
+        "internal": {
+            "enabled": true,
+            "validateWorkerAddress": true,
+            "paymentInterval": 10,
+            "minimumPayment": 100.001,
+            "minimumReserve": 10,
+            "feePercent": 0.02,
+            "feeReceiveAddress": "tQ2TKXXk2jh7EX2RJQ4ZxpZYEdRx7fdiaw",
+            "feeWithdrawalThreshold": 5,
+            "daemon": {
+                "host": "localhost",
+                "port": 27932,
+                "user": "testuser",
+                "password": "testpass"
+            },
+            "redis": {
+                "host": "localhost",
+                "port": 6379
+            }
+        }
+    },
+
+    "ports": {
+        "5547": {
+            "diff": 2
+        }
+    },
+
+    "daemons": [
+        {
+            "host": "localhost",
+            "port": 27932,
+            "user": "testuser",
+            "password": "testpass"
+        }
+    ]
+}