hola-server 0.7.9 → 0.8.2

package/core/bash.js

@@ -11,7 +11,7 @@ const LOG_BASH = "bash";
  */
 const run_script = async (host, script) => {
     return new Promise((resolve) => {
-        exec(`sshpass -p '${host.pwd}' ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p ${host.port} ${host.user}@${host.ip} /bin/bash <<'EOT' \n ${script} \nEOT\n`, { maxBuffer: 1024 * 150000 }, (error, stdout) => {
+        exec(`ssh -i ${host.private} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p ${host.port} ${host.user}@${host.ip} /bin/bash <<'EOT' \n ${script} \nEOT\n`, { maxBuffer: 1024 * 150000 }, (error, stdout) => {
             if (error) {
                 if (is_log_error()) {
                     log_error(LOG_BASH, "error running on host:" + host.name + " the script:" + script + ",error:" + error);
@@ -29,7 +29,7 @@ const run_script = async (host, script) => {
 
 const run_script_file = async (host, script_file) => {
     return new Promise((resolve) => {
-        exec(`sshpass -p '${host.pwd}' ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p ${host.port} ${host.user}@${host.ip} /bin/bash < ${script_file}`, (error, stdout) => {
+        exec(`ssh -i ${host.private} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p ${host.port} ${host.user}@${host.ip} /bin/bash < ${script_file}`, (error, stdout) => {
             if (error) {
                 if (is_log_error()) {
                     log_error(LOG_BASH, "error running on host:" + host.name + " the script_file:" + script_file + ",error:" + error);
@@ -77,7 +77,7 @@ const run_local_cmd = async (cmd, log_extra) => {
  */
 const scp = async (host, remote_file, local_file) => {
     return new Promise((resolve) => {
-        exec(`sshpass -p '${host.pwd}' scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P ${host.port} -q ${host.user}@${host.ip}:${remote_file} ${local_file}`, (error, stdout) => {
+        exec(`scp -C -i ${host.private} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P ${host.port} -q ${host.user}@${host.ip}:${remote_file} ${local_file}`, (error, stdout) => {
             if (error) {
                 if (is_log_error()) {
                     log_error(LOG_BASH, "error scp on host:" + host.name + " remote:" + remote_file + ",local:" + local_file + ",error:" + error);

package/db/db.js

@@ -131,12 +131,12 @@ const bulk_update = async (col, items, attrs) => {
 };
 
 class DB {
-  constructor(url, poolSize, callback) {
+  constructor(url, options, callback) {
     if (!url) {
       return;
     }
 
-    this.db = mongoist(url, { autoReconnect: true, poolSize: poolSize });
+    this.db = mongoist(url, options);
 
     this.db.on("error", function (err) {
       if (is_log_error()) {
@@ -368,7 +368,7 @@ const get_db = (callback) => {
   } else {
     const mongo = get_settings().mongo;
 
-    db_instance = new DB(mongo.url, mongo.pool, callback);
+    db_instance = new DB(mongo.url, mongo.options, callback);
     return db_instance;
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hola-server",
-  "version": "0.7.9",
+  "version": "0.8.2",
   "description": "a meta programming framework used to build nodejs restful api",
   "main": "index.js",
   "scripts": {
@@ -43,4 +43,4 @@
     "url": "https://github.com/hery-node/hola-server/issues"
   },
   "homepage": "https://github.com/hery-node/hola-server#readme"
-}
+}