33
44const fs = require ( 'fs' ) ;
55const async = require ( 'async' ) ;
6- const request = require ( 'request' ) ;
7- const redis = require ( 'redis' ) ;
6+ const request = require ( 'request' ) ; //TODO replace with axios
7+ // const redis = require('redis');
88
99const config = require ( '../config' ) ;
1010const db = require ( '../api/models' ) ;
1111const resource_lib = require ( '../api/resource' ) ;
1212const common = require ( '../api/common' ) ;
1313
14- const pkg = require ( '../package.json' ) ;
15-
16- var rcon = null ;
14+ const pkg = require ( '../api/package.json' ) ;
1715
1816db . init ( function ( err ) {
1917 if ( err ) throw err ;
2018 run ( ) ;
2119} , false ) ; //don't connect to amqp
2220
21+ /* we run this synchronously now via cron
2322async function report(resources, counts, cb) {
2423 const ssh = common.report_ssh();
2524 const report = {
@@ -50,7 +49,7 @@ async function report(resources, counts, cb) {
5049
5150 console.log("---reporting---");
5251 console.dir(report);
53- rcon = redis . createClient ( config . redis . port , config . redis . server ) ;
52+ const rcon = redis.createClient(config.redis.port, config.redis.server);
5453 rcon.on('error', cb);
5554 rcon.on('ready', ()=>{
5655 console.log("connected to redis");
@@ -59,6 +58,7 @@ async function report(resources, counts, cb) {
5958 cb();
6059 });
6160}
61+ */
6262
6363//go through all registered resources and check for connectivity & smoke test
6464function run ( ) {
@@ -146,10 +146,14 @@ function run() {
146146 } , err => {
147147 if ( err ) console . error ( err ) ; //continue
148148 else console . debug ( "checked " + resources . length + " resources" ) ;
149+ /*
149150 report(resources, counts, err=>{
150151 db.disconnect()
151152 console.log("all done");
152153 });
154+ */
155+ db . disconnect ( )
156+ console . log ( "all done" ) ;
153157 } ) ;
154158 } ) ;
155159}
0 commit comments