RC1 for 0.2.2

Signed-off-by: magnus <mfeuer@jaguarlandrover.com>

11 files changed, 36 insertions, 29 deletions

diff --git a/Makefile b/Makefile
index 4fef112..d2ecb48 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@
 .PHONY:	all deps compile clean rpm rpmclean
 
 
-VERSION=0.2.1
+VERSION=0.2.2
 
 all: deps compile
 
diff --git a/components/schedule/src/schedule.erl b/components/schedule/src/schedule.erl
index 90e5085..3de1e87 100644
--- a/components/schedule/src/schedule.erl
+++ b/components/schedule/src/schedule.erl
@@ -173,7 +173,6 @@ handle_call(_Request, _From, St) ->
 %%--------------------------------------------------------------------
 
 handle_cast( {register_remote_services, NetworkAddress, AvailableServices}, St) ->
-
     ?info("    schedule:register_remote_services(): NetworkAddress:    ~p", [NetworkAddress]),
     ?info("    schedule:register_remote_services(): AvailableService:  ~p", [AvailableServices]),
     {ok, NSt} =  multiple_services_available(AvailableServices, NetworkAddress, St),
@@ -591,16 +590,24 @@ create_transaction_id(St) ->
 calculate_timeout_period(UTC) ->
     { Mega, Sec, _Micro } = now(),
     Now = Mega * 1000000 + Sec,
-    ?debug("schedule:calculate_timeout_period(): Now:     ~p", [ Now ]),
-    ?debug("schedule:calculate_timeout_period(): Timeout: ~p", [ UTC ]),
-    ?debug("schedule:calculate_timeout_period(): Period:  ~p", [ UTC - Now]),
+    ?debug("schedule:calculate_timeout_period(): Timeout(~p) - Now(~p) = ~p", [ UTC, Now, UTC - Now ]),
+
+    %% Cap the timeout value at something reasonable
+    TOut = 
+	case UTC - Now >= 4294967295 of
+	    true -> 
+		?info("schedule:calculate_timeout_period(): Timeout(~p) - Now(~p) = ~p: Truncated to 4294967295", [ UTC, Now, UTC - Now ]),
+		4294967295;
+
+	false -> UTC - Now
+    end,
 
-    case UTC - Now =< 0 of
+    case TOut =< 0 of
 	true ->
 	    1; %% One millisec is the smallest value we will time out on
 
 	false ->
-	    (UTC - Now) * 1000 
+	    TOut * 1000 
     end.
 
 %% Handle a callback for a timed out message.
diff --git a/packaging/README.md b/packaging/README.md
index 57143cd..34c69a5 100644
--- a/packaging/README.md
+++ b/packaging/README.md
@@ -102,7 +102,7 @@ Go to the top directory of RVI and execute:
 An RPM file will be generated at the end of the build which can be
 installed on a Tizen box. The RPM can be found at:
 
-    ~/GBS-ROOT/local/repos/tizen/i586/RPMS/rvi-0.2.1-1.i686.rpm
+    ~/GBS-ROOT/local/repos/tizen/i586/RPMS/rvi-0.2.2-1.i686.rpm
 
 
 
diff --git a/packaging/rvi.spec b/packaging/rvi.spec
index 8a716a2..0ce9ade 100755
--- a/packaging/rvi.spec
+++ b/packaging/rvi.spec
@@ -1,10 +1,10 @@
 Summary:    Remote Vehicle Interaction Node, running on top of Erlang,
 Name:       rvi
-Version:    0.2.1
+Version:    0.2.2
 Release:    1
 Group:      Applications/System
 License:    Mozilla Public License v2
-Source:     http://content.linuxfoundation.org/auto/downloads/rvi/rvi-0.2.1.tgz
+Source:     http://content.linuxfoundation.org/auto/downloads/rvi/rvi-0.2.2.tgz
 
 BuildRequires:  make
 BuildRequires:  glib2-devel
@@ -58,5 +58,5 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 /usr/lib/systemd/system/rvi.service 
 /etc/systemd/system/multi-user.target.wants/rvi.service
-/opt/rvi-0.2.1
+/opt/rvi-0.2.2
 
diff --git a/rel/reltool.config b/rel/reltool.config
index af3bdb9..715477b 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -4,7 +4,7 @@
        {lib_dirs, ["../deps/", "../components/"]},
        {erts, [{mod_cond, derived}, {app_file, strip}]},
        {app_file, strip},
-       {rel, "rvi", "0.2.1",
+       {rel, "rvi", "0.2.2",
         [
          kernel,
          stdlib,
diff --git a/rpm/SPECS/rvi-0.2.1.spec b/rpm/SPECS/rvi-0.2.1.spec
index 8b93093..4f5b125 100644
--- a/rpm/SPECS/rvi-0.2.1.spec
+++ b/rpm/SPECS/rvi-0.2.1.spec
@@ -1,12 +1,12 @@
 Summary: Remote Vehicle Interaction Node
 Name: rvi
-Version: 0.2.1
+Version: 0.2.2
 Release: 1
 # Copyright: Jaguar Land Rover -
 License: Mozilla Public License v2
 Vendor: Jaguar Land Rover
 Group: Applications/System
-Source: http://content.linuxfoundation.org/auto/downloads/rvi/rvi-0.2.1.tgz
+Source: http://content.linuxfoundation.org/auto/downloads/rvi/rvi-0.2.2.tgz
 Buildroot: /var/tmp/%{name}-buildroot
 
 # Requires: 
@@ -69,4 +69,4 @@ rm -rf $RPM_BUILD_ROOT
 /etc/rc4.d
 /etc/rc5.d
 /etc/rc6.d
-/opt/rvi-0.2.1
+/opt/rvi-0.2.2
diff --git a/scripts/rvi b/scripts/rvi
index bc8bc24..52340e4 100755
--- a/scripts/rvi
+++ b/scripts/rvi
@@ -18,7 +18,7 @@ set -e
 case "$1" in
   start)
         log_daemon_msg "Starting Remote Vehicle Interaction Node..." "rvi"
-        if /opt/rvi-0.2.1/bin/rvi start; then
+        if /opt/rvi-0.2.2/bin/rvi start; then
             log_end_msg 0
         else
             log_end_msg 1
@@ -26,7 +26,7 @@ case "$1" in
         ;;
   stop)
         log_daemon_msg "Stopping Remote Vehicle Interaction Node..." "rvi"
-        if /opt/rvi-0.2.1/bin/rvi stop; then
+        if /opt/rvi-0.2.2/bin/rvi stop; then
             log_end_msg 0
         else
             log_end_msg 1
@@ -34,7 +34,7 @@ case "$1" in
         ;;
   restart)
         log_daemon_msg "Restarting Remote Vehicle Interaction Node..." "rvi"
-        if /opt/rvi-0.2.1/bin/rvi restart; then
+        if /opt/rvi-0.2.2/bin/rvi restart; then
             log_end_msg 0
         else
             log_end_msg 1
diff --git a/scripts/rvi.service b/scripts/rvi.service
index 8a4a4e6..0bda8c3 100644
--- a/scripts/rvi.service
+++ b/scripts/rvi.service
@@ -4,14 +4,14 @@ Description=Remote Vehicle Interaction Service
 Wants=network-online.target
 
 [Service]
-Environment="HOME=/opt/rvi-0.2.1"
+Environment="HOME=/opt/rvi-0.2.2"
 Type=forking
 StandardOutput=journal
 StandardError=journal
-ExecStartPre=/opt/rvi-0.2.1/erts-5.10.4/bin/epmd -daemon
-ExecStart=/bin/sh /opt/rvi-0.2.1/bin/rvi start
-ExecStop=/bin/sh /opt/rvi-0.2.1/bin/rvi stop
-ExecStopPost=/opt/rvi-0.2.1/erts-5.10.4/bin/epmd -kill
+ExecStartPre=/opt/rvi-0.2.2/erts-5.10.4/bin/epmd -daemon
+ExecStart=/bin/sh /opt/rvi-0.2.2/bin/rvi start
+ExecStop=/bin/sh /opt/rvi-0.2.2/bin/rvi stop
+ExecStopPost=/opt/rvi-0.2.2/erts-5.10.4/bin/epmd -kill
 GuessMainPID=yes
 
 [Install]
diff --git a/sota_demo/README.md b/sota_demo/README.md
index 9199d1c..92b628e 100644
--- a/sota_demo/README.md
+++ b/sota_demo/README.md
@@ -6,7 +6,7 @@ All files are available at rvi@rvi1.nginfotpdx.net:sota_demo
 
 Flash the tizen image TizenIVI30_APR22_AGL_19SEP2014.raw.gz
 
-Once up, install the RVI 0.2.1 rpm: rvi-0.2.1-1.i686.rpm
+Once up, install the RVI 0.2.2 rpm: rvi-0.2.2-1.i686.rpm
 
 Install the updated home screen: intelPoc10.HomeScreen.wgt.20141024_3
 wrt-installer -un intelPoc10.HomeScreen
diff --git a/sota_demo/sota.service b/sota_demo/sota.service
index b140bb3..0ecd7c4 100644
--- a/sota_demo/sota.service
+++ b/sota_demo/sota.service
@@ -9,10 +9,10 @@ WorkingDirectory=/opt/sota
 Type=simple
 StandardOutput=journal
 StandardError=journal
-#ExecStart=/bin/sh -c "cd /opt/sota;/usr/bin/python sota_device.py http://localhost:8811"
-ExecStart=/usr/bin/python sota_device.py http://localhost:8811
-#ExecStop=/bin/sh /opt/rvi-0.2.1/bin/rvi stop
-#ExecStopPost=/opt/rvi-0.2.1/erts-5.10.4/bin/epmd -kill
+ExecStart=/bin/sh -c "sleep 10;/usr/bin/python sota_device.py http://localhost:8811"
+#ExecStart=/usr/bin/python sota_device.py http://localhost:8811
+#ExecStop=/bin/sh /opt/rvi-0.2.2/bin/rvi stop
+#ExecStopPost=/opt/rvi-0.2.2/erts-5.10.4/bin/epmd -kill
 GuessMainPID=yes
 
 [Install]
diff --git a/src/rvi.app.src b/src/rvi.app.src
index 3885c4f..62e408b 100644
--- a/src/rvi.app.src
+++ b/src/rvi.app.src
@@ -11,7 +11,7 @@
 {application, rvi,
  [
   {description, ""},
-  {vsn, "0.2.1"},
+  {vsn, "0.2.2"},
   {registered, []},
   {applications, [
                   kernel,