Sailor update (#12)

Author: uaArsen

CHANGELOG.md

@@ -0,0 +1,9 @@
+ ## 1.1.0 (January 30, 2020)
+
+ * Update sailor version to 2.6.1
+ * Refactor console.log to built in sailor logger
+ * Change build type to `docker`
+
+ ## 1.0.0 (June 14, 2018)
+
+ * Initial release

README.md

@@ -6,6 +6,9 @@ MSSQL Component component for the [elastic.io platform](http://www.elastic.io)
 
 ![image](https://user-images.githubusercontent.com/56208/29715706-b4930bdc-89a8-11e7-8a0d-969959d26dd6.png)
 
+## Environment Variables
+1. LOG_LEVEL - controls verbosity of logger. Possible values: `trace`, `debug` `info`, `warn`, `error`. Default: `info`
+
 ## Before you Begin
 
 Before you can deploy any code into elastic.io **you must be a registered elastic.io platform user**. Please see our home page at [http://www.elastic.io](http://www.elastic.io) to learn how. 

component.json

@@ -1,6 +1,7 @@
 {
   "title": "SQL Server",
   "description": "elastic.io integration component for Microsoft SQL Server",
+  "buildType": "docker",
   "credentials": {
     "fields": {
       "server": {
@@ -85,6 +86,15 @@
       "description": "Executes a SELECT statement that fetches potentially multiple database rows from the database",
       "main": "./lib/actions/select.js",
       "type": "polling",
+      "fields": {
+        "query": {
+          "label": "SQL Query",
+          "required": true,
+          "viewClass": "TextAreaWithNoteView",
+          "placeholder": "INSERT INTO films (code,title,kind) VALUES (@code:number,@title:string,@kind:string)",
+          "note": "You can use parameters of message body as <i>@value:number</i> and type is <i>:type</i>"
+        }
+      },
       "metadata": {
         "in": {
           "type": "object",

lib/actions/insert.js

@@ -1,7 +1,8 @@
-/*eslint no-invalid-this: 0 no-console: 0*/
+/*eslint no-invalid-this: 0 */
 'use strict';
 const co = require('co');
 const cosql = require('co-mssql');
+const logger = require('@elastic.io/component-logger')();
 
 let pstmt;
 
@@ -26,18 +27,18 @@ function init(cfg) {
         + cfg.database
         + ((cfg.domain) ? '?domain=' + cfg.domain + '&encrypt=' + cfg.encrypt
             : '?encrypt=' + cfg.encrypt);
-    console.log(conString);
+    logger.trace(conString);
     return co(function* gen() {
-        console.log('Connecting to the database');
+        logger.info('Connecting to the database');
         const connection = new cosql.Connection(conString);
         // Always attach an error listener
         connection.on('error', (err) => this.emit('error', err));
         let sql = cfg.query;
         yield connection.connect();
-        console.log('Connection established');
-        console.log('Preparing query=%s', sql);
+        logger.info('Connection established');
+        logger.trace('Preparing query=%s', sql);
         const vars = sql.match(VARS_REGEXP);
-        console.log('Found following prepared variable:type pairs=%j', vars);
+        logger.trace('Found following prepared variable:type pairs=%j', vars);
         pstmt = new cosql.PreparedStatement(connection);
         for (const tuple of vars) {
             const [placeholder, type] = tuple.split(':');
@@ -69,14 +70,14 @@ function init(cfg) {
                     pstmt.input(name, cosql.BigInt);
                     break;
                 default:
-                    console.log('WARNING: Can figure out the type key=%s type=%s', name, type);
+                    logger.warn('WARNING: Can figure out the type key=%s type=%s', name, type);
             }
             // Now let's remove all :string :boolean :date etc to the name only
             sql = sql.replace(tuple, placeholder);
         }
-        console.log('Resulting SQL=%s', sql);
+        logger.trace('Resulting SQL=%s', sql);
         yield pstmt.prepare(sql);
-        console.log('Preparing statement created');
+        logger.info('Preparing statement created');
     }.bind(this));
 }
 
@@ -132,10 +133,11 @@ function getMetaModel(cfg, cb) {
  * @param cfg configuration that is account information and configuration field values
  */
 function processAction(msg) {
+    const that = this;
     return co(function* gen() {
-        console.log('Executing statement');
+        that.logger.info('Executing statement');
         yield pstmt.execute(msg.body);
-        console.log('Execution completed');
+        that.logger.info('Execution completed');
         return msg;
     }.bind(this));
 }

lib/actions/select.js

@@ -1,8 +1,9 @@
-/*eslint no-invalid-this: 0 no-console: 0*/
+/*eslint no-invalid-this: 0 */
 'use strict';
 const eioUtils = require('elasticio-node').messages;
 const co = require('co');
 const cosql = require('co-mssql');
+const logger = require('@elastic.io/component-logger')();
 
 const LAST_POLL_PLACEHOLDER = '%%EIO_LAST_POLL%%';
 
@@ -27,11 +28,11 @@ function init(cfg) {
       + ((cfg.domain) ? '?domain=' + cfg.domain + '&encrypt=' + cfg.encrypt
           : '?encrypt=' + cfg.encrypt);
     return co(function* gen() {
-        console.log('Connecting to the database');
+        logger.info('Connecting to the database');
         connection = new cosql.Connection(conString);
         connection.on('error', (err) => this.emit('error', err));
         yield connection.connect();
-        console.log('Connection established');
+        logger.info('Connection established');
     }.bind(this));
 }
 
@@ -46,16 +47,17 @@ function processAction(msg, cfg, snapshot = {}) {
     const now = new Date().toISOString();
     // Last poll should come from Snapshot, if not it's beginning of time
     const lastPoll = snapshot.lastPoll || new Date(0).toISOString();
-    console.log('Last polling timestamp=%s', lastPoll);
+    this.logger.info('Last polling timestamp=%s', lastPoll);
     const sql = originalSql.split(LAST_POLL_PLACEHOLDER).join(lastPoll);
-    console.log('Original query=%s', originalSql);
-    console.log('Transformed query=%s', sql);
+    this.logger.trace('Original query=%s', originalSql);
+    this.logger.trace('Transformed query=%s', sql);
+    const that = this;
     return co(function* gen() {
         const request = new cosql.Request(connection);
         request.stream = true;
 
         request.on('recordset', (recordset) => {
-            console.log('Have got recordset metadata=%j', recordset);
+            that.logger.trace('Have got recordset metadata=%j', recordset);
         });
 
         request.on('row', (row) => {
@@ -67,7 +69,7 @@ function processAction(msg, cfg, snapshot = {}) {
         });
 
         request.on('done', (affected) => {
-            console.log('Query execution completed, affected=%s', affected);
+            that.logger.info('Query execution completed, affected=%s', affected);
             this.emit('snapshot', {
                 lastPoll: now
             });