Compare commits

...

2 Commits

Author SHA1 Message Date
ef9cb193d5 1.0.24 2018-11-25 22:06:25 +01:00
9f706e0a70 fix(core): update 2018-11-25 22:06:25 +01:00
5 changed files with 20 additions and 39 deletions

View File

@ -37,18 +37,6 @@ snyk:
# ==================== # ====================
# test stage # test stage
# ==================== # ====================
testLEGACY:
stage: test
script:
- npmci npm prepare
- npmci node install legacy
- npmci npm install
- npmci npm test
coverage: /\d+.?\d+?\%\s*coverage/
tags:
- docker
- notpriv
allow_failure: true
testLTS: testLTS:
stage: test stage: test
@ -135,13 +123,3 @@ pages:
paths: paths:
- public - public
allow_failure: true allow_failure: true
windowsCompatibility:
image: stefanscherer/node-windows:10-build-tools
stage: metadata
script:
- npm install & npm test
coverage: /\d+.?\d+?\%\s*coverage/
tags:
- windows
allow_failure: true

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "@mojoio/elasticsearch", "name": "@mojoio/elasticsearch",
"version": "1.0.23", "version": "1.0.24",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "@mojoio/elasticsearch", "name": "@mojoio/elasticsearch",
"version": "1.0.23", "version": "1.0.24",
"private": false, "private": false,
"description": "log to elasticsearch in a kibana compatible format", "description": "log to elasticsearch in a kibana compatible format",
"main": "dist/index.js", "main": "dist/index.js",

View File

@ -44,15 +44,18 @@ export class ElasticIndex {
if (todayAsUnix - rententionPeriodAsUnix > dateAsUnix) { if (todayAsUnix - rententionPeriodAsUnix > dateAsUnix) {
console.log(`found old index ${indexName}`); console.log(`found old index ${indexName}`);
const done2 = plugins.smartpromise.defer(); const done2 = plugins.smartpromise.defer();
this.elasticSearchRef.client.indices.delete({ this.elasticSearchRef.client.indices.delete(
{
index: indexName index: indexName
}, (err2, response2) => { },
if(err2) { (err2, response2) => {
if (err2) {
console.log(err2); console.log(err2);
} }
console.log(`deleted ${indexName}`); console.log(`deleted ${indexName}`);
done2.resolve(); done2.resolve();
}); }
);
await done2.promise; await done2.promise;
} }
} }

View File

@ -35,7 +35,7 @@ export class ElasticSearch<T> {
*/ */
constructor(optionsArg: IElasticSearchConstructorOptions) { constructor(optionsArg: IElasticSearchConstructorOptions) {
this.client = new ElasticClient({ this.client = new ElasticClient({
host: this.computeHostString(optionsArg), host: this.computeHostString(optionsArg)
// log: 'trace' // log: 'trace'
}); });
this.indexPrefix = optionsArg.indexPrefix; this.indexPrefix = optionsArg.indexPrefix;
@ -61,10 +61,10 @@ export class ElasticSearch<T> {
public async log(logPackageArg: ILogPackage, scheduleOverwrite = false) { public async log(logPackageArg: ILogPackage, scheduleOverwrite = false) {
const now = new Date(); const now = new Date();
const indexToUse = `${this.indexPrefix}-${now.getFullYear()}.${('0' + (now.getMonth() + 1)).slice(-2)}.${( const indexToUse = `${this.indexPrefix}-${now.getFullYear()}.${(
'0' + now.getDate() '0' +
).slice(-2)}`; (now.getMonth() + 1)
).slice(-2)}.${('0' + now.getDate()).slice(-2)}`;
if (this.elasticScheduler.docsScheduled && !scheduleOverwrite) { if (this.elasticScheduler.docsScheduled && !scheduleOverwrite) {
this.elasticScheduler.scheduleDoc(logPackageArg); this.elasticScheduler.scheduleDoc(logPackageArg);
@ -94,11 +94,11 @@ export class ElasticSearch<T> {
); );
} }
get logDestination (): ILogDestination { get logDestination(): ILogDestination {
return { return {
handleLog: (smartlogPackageArg: ILogPackage) => { handleLog: (smartlogPackageArg: ILogPackage) => {
this.log(smartlogPackageArg); this.log(smartlogPackageArg);
} }
} };
} }
} }