diff --git a/DBExtractor/DBExtractor.config.json b/DBExtractor/DBExtractor.config.json index aa20bce..b38d274 100644 --- a/DBExtractor/DBExtractor.config.json +++ b/DBExtractor/DBExtractor.config.json @@ -2,6 +2,10 @@ "dbDriver":"mssql", "dbDriverComment":"either mssql (user/password) or mssql/msnodesqlv8 (trustedConnection)", "processingType": "casrpslog", "sourceTag": "CCERpsLog", + "maxResultsPerMessage":100, + "statements":{ + "poller":"'select top ' + config.maxResultsPerMessage + ' * from rpslog where pkey > \\'' + maxPKey + '\\' order by pkey'" + }, "serverURI": "http://localhost:2222", "pollIntervalIdle": 10000, "sqlConfig": { diff --git a/DBExtractor/DBExtractor.config.json.example b/DBExtractor/DBExtractor.config.json.example index 82c2038..de91abf 100644 --- a/DBExtractor/DBExtractor.config.json.example +++ b/DBExtractor/DBExtractor.config.json.example @@ -3,6 +3,10 @@ "processingType": "casrpslog", "sourceTag": "CCERpsLog", "serverURI": "http://localhost:2222", + "maxResultsPerMessage":100, + "statements":{ + "poller":"'select top ' + config.maxResultsPerMessage + ' * from rpslog where pkey > \\'' + maxPKey + '\\' order by pkey'" + }, "pollIntervalIdle": 10000, "UP_sqlConfig": { "user": "casdbuser", diff --git a/DBExtractor/DBExtractor.js b/DBExtractor/DBExtractor.js index 4fbe8e9..5e9cdf8 100644 --- a/DBExtractor/DBExtractor.js +++ b/DBExtractor/DBExtractor.js @@ -39,7 +39,6 @@ logger.log("info", `DBExtractor v0.1 Starting`); logger.log("debug", "Config" + JSON.stringify(config)) -const maxResultsPerMessage=100; let maxPKey = ""; let maxPKeyUnsent = ""; let allRows = []; @@ -52,7 +51,7 @@ try { logger.log("debug", "MaxPKey Loaded: " + maxPKey); } catch (ex) { if (ex.errno === -4058) { - logger.log("info", "MaxPKey-File not existing. Will be created."); + logger.log("info", "MaxPKey-File not existing. All data will be processed"); } else { logger.log("error", "opening DBExtractor.maxPKey.dat :" + ex); } @@ -67,7 +66,7 @@ try { sqlRequest.stream = true; function runNextPoll(){ - sqlRequest.query("select top " + maxResultsPerMessage + " * from rpslog where pkey > '" + maxPKey + "' order by pkey"); + sqlRequest.query(eval(config.statements.poller)); } runNextPoll(); diff --git a/DBExtractor/DBExtractor.maxPKey.dat b/DBExtractor/DBExtractor.maxPKey.dat index df706b3..13f9a71 100644 --- a/DBExtractor/DBExtractor.maxPKey.dat +++ b/DBExtractor/DBExtractor.maxPKey.dat @@ -1 +1 @@ -0010000000a87kj9 \ No newline at end of file +0010000000a7l7bx \ No newline at end of file diff --git a/logAggregator.js b/logAggregator.js index a950fcd..13d70a7 100644 --- a/logAggregator.js +++ b/logAggregator.js @@ -37,7 +37,8 @@ console.log(`logAggregator Service Copyright (C) 2019 j.tretter@gmail.com You should have received a copy of the GNU General Public License along with this program. If not, see .`); - logger.log("info","logAggregator Service v0.1 Starting") +logger.log("info","logAggregator Service v0.1 Starting"); + const server = micro(async (req, res) => { const js = await json(req);