Merge pull request #90 from lwindg/develop

taotao · web-flow · commit 1bd8c133cbc7 · 2016-11-10T00:18:35.000+08:00
fix: Missing "reboot" information of "keepalive"
diff --git a/build-deb/debian/changelog b/build-deb/debian/changelog
@@ -1,3 +1,9 @@
+sanji-bundle-cellular (3.0.1-1) unstable; urgency=low
+
+  * fix: Missing "reboot" information of "keepalive".
+
+ -- Aeluin Chen <aeluin.chen@moxa.com>  Wed, 09 Nov 2016 17:33:33 +0800
+
 sanji-bundle-cellular (3.0.0-1) unstable; urgency=low
 
   * feat: Support secondary APN.
diff --git a/bundle.json b/bundle.json
@@ -1,6 +1,6 @@
 {
   "name": "cellular",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "author": "Aeluin Chen",
   "email": "aeluin.chen@moxa.com",
   "description": "Provides the cellular configuration interface",
diff --git a/index.py b/index.py
@@ -322,7 +322,11 @@ def _get(self):
             "keepalive": {
                 "enable": config["keepalive"]["enable"],
                 "targetHost": config["keepalive"]["targetHost"],
-                "intervalSec": config["keepalive"]["intervalSec"]
+                "intervalSec": config["keepalive"]["intervalSec"],
+                "reboot": {
+                    "enable": config["keepalive"]["reboot"]["enable"],
+                    "cycles": config["keepalive"]["reboot"]["cycles"]
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "cellular",`
`3`		`- "version": "3.0.0",`
	`3`	`+ "version": "3.0.1",`
`4`	`4`	`"author": "Aeluin Chen",`
`5`	`5`	`"email": "[email protected]",`
`6`	`6`	`"description": "Provides the cellular configuration interface",`
Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,11 @@ def _get(self):`
`322`	`322`	`"keepalive": {`
`323`	`323`	`"enable": config["keepalive"]["enable"],`
`324`	`324`	`"targetHost": config["keepalive"]["targetHost"],`
`325`		`- "intervalSec": config["keepalive"]["intervalSec"]`
	`325`	`+ "intervalSec": config["keepalive"]["intervalSec"],`
	`326`	`+ "reboot": {`
	`327`	`+ "enable": config["keepalive"]["reboot"]["enable"],`
	`328`	`+ "cycles": config["keepalive"]["reboot"]["cycles"]`
	`329`	`+ }`
`326`	`330`	`}`
`327`	`331`	`}`
`328`	`332`