[SECARSP-142] Logger service was integrated. Error logs are sent to SAM Server

Change-Id: I7cf2e73828f58288933403a679c256782efcf085

diff --git a/dashboard/package-lock.json b/dashboard/package-lock.json
index 7e0a7b1..1e18c11 100644 (file)
--- a/dashboard/package-lock.json
+++ b/dashboard/package-lock.json
@@ -8676,6 +8676,11 @@
       "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
       "dev": true
     },
+    "ngx-logger": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/ngx-logger/-/ngx-logger-1.1.2.tgz",
+      "integrity": "sha1-//QiCP9KTHqmIf7z9nOgCHW9Yts="
+    },
     "no-case": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",

diff --git a/dashboard/package.json b/dashboard/package.json
index 87dad0a..e6f993e 100644 (file)
--- a/dashboard/package.json
+++ b/dashboard/package.json
@@ -48,7 +48,8 @@
     "roboto-fontface": "0.8.0",
     "rxjs": "5.5.5",
     "typeface-exo": "0.0.22",
-    "zone.js": "0.8.18"
+    "zone.js": "0.8.18",
+    "ngx-logger": "1.1.2"
   },
   "devDependencies": {
     "@angular/cli": "1.6.3",

diff --git a/dashboard/src/app/app.module.ts b/dashboard/src/app/app.module.ts
index 511c6f8..79ed018 100644 (file)
--- a/dashboard/src/app/app.module.ts
+++ b/dashboard/src/app/app.module.ts
@@ -12,6 +12,10 @@ import { ThemeModule } from './@theme/theme.module';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { NB_AUTH_TOKEN_CLASS, NbAuthJWTToken } from '@nebular/auth';
 import { AuthGuardService, AuthService } from './@core/auth';
+import { LoggerModule, NgxLoggerLevel } from 'ngx-logger';
+import { SERVER_URL } from '../../config';
+
+const serverLog = SERVER_URL + '/logs';
 
 @NgModule({
   declarations: [AppComponent],
@@ -25,6 +29,11 @@ import { AuthGuardService, AuthService } from './@core/auth';
     NgbModule.forRoot(),
     ThemeModule.forRoot(),
     CoreModule.forRoot(),
+    LoggerModule.forRoot({
+      serverLoggingUrl: serverLog,
+      level: NgxLoggerLevel.DEBUG,
+      serverLogLevel: NgxLoggerLevel.ERROR,
+    }),
   ],
   bootstrap: [AppComponent],
   providers: [

diff --git a/dashboard/src/app/services/device.service.ts b/dashboard/src/app/services/device.service.ts
index 0b65a37..cca153a 100644 (file)
--- a/dashboard/src/app/services/device.service.ts
+++ b/dashboard/src/app/services/device.service.ts
@@ -4,19 +4,20 @@ import { Observable } from 'rxjs/Observable';
 import { tap } from 'rxjs/operators';
 import { Device, UpdateDevice, UpdateDevices } from '../models';
 import { SERVER_URL } from '../../../config';
+import { NGXLogger } from 'ngx-logger';
 
 @Injectable()
 export class DeviceService {
   private getAllDevicesUrl = SERVER_URL + '/devices';
   private updateDevicesUrl = SERVER_URL + '/devices/update';
 
-  constructor(private http: HttpClient) { }
+  constructor(private http: HttpClient, private logger: NGXLogger) { }
 
   getAllDevices(): Observable<Device[]> {
     return this.http.get<Device[]>(this.getAllDevicesUrl).pipe(
       tap(
-        ok => console.info(`got devices`),
-        error => console.error(`get all devices error`),
+        ok => this.logger.info(`Got devices`),
+        error => this.logger.error(`Get all devices error`),
       ),
     );
   }
@@ -26,8 +27,8 @@ export class DeviceService {
 
     return this.http.put<Device[]>(this.updateDevicesUrl, updates).pipe(
       tap(
-        ok => console.info(`successfully updated`),
-        error => console.error(`error during update`),
+        ok => this.logger.info(`Devices were successfully updated`),
+        error => this.logger.error(`Error during devices updating`),
       ),
     );
   }