pooling refactor: gather/parse data in softpoll

refactor parsing code out into it's own function. in the softpoll build
all the data that will be sent to influxdb and post it all at once.

Author: schulzad

smartapps/influxdb-logger/influxdb-logger.groovy

@@ -67,7 +67,6 @@ preferences {
         input "prefDatabaseName", "text", title: "Database Name", defaultValue: "", required: true
         input "prefDatabaseUser", "text", title: "Username", required: false
         input "prefDatabasePass", "text", title: "Password", required: false
-        input "preDatabasePooling", "bool", title: "Enable Pooling", defaultValue: true, required: true
     }
 
     section("Polling:") {
@@ -172,7 +171,6 @@ def updated() {
     state.databaseName = settings.prefDatabaseName
     state.databaseUser = settings.prefDatabaseUser
     state.databasePass = settings.prefDatabasePass
-    state.databasePool = settings.prefDatabasePooling
 
     state.path = "/write?db=${state.databaseName}"
     state.headers = [:]
@@ -231,9 +229,6 @@ def updated() {
     state.softPollingInterval = settings.prefSoftPollingInterval.toInteger()
     manageSchedules()
 
-    // Configure if we're pooling InfluxPooling
-    state.poolData = ""
-
     // Configure Subscriptions:
     manageSubscriptions()
 }
@@ -271,22 +266,29 @@ def handleModeEvent(evt) {
 /**
  *  handleEvent(evt)
  *
- *  Builds data to send to InfluxDB.
+ *  parseEvent() then post to InfluxDB.
+ **/
+def handleEvent(evt) {
+    logger("handleEvent(): $evt.displayName($evt.name:$evt.unit) $evt.value","info")
+    data = parseEvent(evt)
+    postToInfluxDB(data)
+}
+
+/**
+ *  parseEvent(evt)
+ *
+ *  Parses event data to send to InfluxDB.
  *   - Escapes and quotes string values.
  *   - Calculates logical binary values where string values can be
  *     represented as binary values (e.g. contact: closed = 1, open = 0)
  *
- *  Useful references:
- *   - http://docs.smartthings.com/en/latest/capabilities-reference.html
- *   - https://docs.influxdata.com/influxdb/v0.10/guides/writing_data/
  **/
-def handleEvent(evt) {
-    logger("handleEvent(): $evt.displayName($evt.name:$evt.unit) $evt.value","info")
-
+def parseEvent(evt) {
     // Build data string to send to InfluxDB:
     //  Format: <measurement>[,<tag_name>=<tag_value>] field=<field_value>
     //    If value is an integer, it must have a trailing "i"
     //    If value is a string, it must be enclosed in double quotes.
+    logger("handleEvent(): $evt.displayName($evt.name:$evt.unit) $evt.value","info")
     def measurement = evt.name
     // tags:
     def deviceId = escapeStringForInfluxDB(evt.deviceId)
@@ -487,15 +489,7 @@ def handleEvent(evt) {
     else {
         data += ",unit=${unit} value=${value}"
     }
-
-    // Post data to InfluxDB pool requests if enabled.
-    if (settings.preDatabasePooling) {
-        poolInfluxDB(data)
-    }
-    else {
-        postToInfluxDB(data)
-    }
-
+    return data
 }
 
 
@@ -520,15 +514,16 @@ def softPoll() {
 
     // Iterate over each attribute for each device, in each device collection in deviceAttributes:
     def devs // temp variable to hold device collection.
+    def eventsData = ""
     state.deviceAttributes.each { da ->
         devs = settings."${da.devices}"
         if (devs && (da.attributes)) {
             devs.each { d ->
                 da.attributes.each { attr ->
                     if (d.hasAttribute(attr) && d.latestState(attr)?.value != null) {
                         logger("softPoll(): Softpolling device ${d} for attribute: ${attr}","info")
-                        // Send fake event to handleEvent():
-                        handleEvent([
+                        // Build multiple event string to sent to InfluxDB
+                        eventsData = eventsData + '\n' + parseEvent([
                             name: attr,
                             value: d.latestState(attr)?.value,
                             unit: d.latestState(attr)?.unit,
@@ -541,7 +536,7 @@ def softPoll() {
             }
         }
     }
-
+    postToInfluxDB(eventsData)
 }
 
 /**
@@ -598,31 +593,6 @@ def logSystemProperties() {
 
 }
 
-
-/**
- * poolInfluxDB()
- **/
-def poolInfluxDB(data) {
-  state.poolData = state.poolData + '\n' + "${data}"
-  // If 80% of state data max commit immediately
-  if (state.poolData.size() >= 80000) {
-    commitPoolToInfluxDB()
-  }
-  else {
-    runIn(5, commitPoolToInfluxDB)
-  }
-}
-
-/**
- * commit Pool
- **/
-def commitPoolToInfluxDB() {
-  logger("commitPoolToInfluxDB(): ${state.poolData.size()} bytes", "info")
-  logger("commitPoolToInfluxDB(): ${state.poolData}", "info")
-  postToInfluxDB(state.poolData)
-  state.poolData = ""
-}
-
 /**
  *  postToInfluxDB()
  *
@@ -829,5 +799,4 @@ private getGroupName(id) {
     else if (id == 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX') {return 'Lounge'}
     else if (id == 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX') {return 'Office'}
     else {return 'Unknown'}
-}
-
+}