Author: richard
Date: Wed Mar 4 03:25:14 2009
New Revision: 4679
URL: http://svn.slimdevices.com/jive?rev=4679&view=rev
Log:
Bug: N/A
Description:
Make slimproto reconnect if the network connection is established.
Clean up some debug.
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua?rev=4679&r1=4678&r2=4679&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
Wed Mar 4 03:25:14 2009
@@ -83,21 +83,20 @@
-- squeezecenter on the poll list
- log:debug("*****Polled Server List:")
+ log:debug("Polled Servers:")
local poll = appletManager:callService("getPollList")
for address,_ in pairs(poll) do
- log:debug('Found: ', address)
+ log:debug("\t", address)
if address ~= "255.255.255.255" then
- log:debug('Add to menu: ', address)
self:_addServerItem(nil, address)
end
end
-- discovered squeezecenters
- log:debug('*****Discovered Server List:')
+ log:debug("Discovered Servers:")
for _,server in appletManager:callService("iterateSqueezeCenters") do
- log:debug('discovered server: ', server)
+ log:debug("\t", server)
self:_addServerItem(server)
end
@@ -251,10 +250,8 @@
function notify_playerNew(self, player)
- log:warn("waitForConnect=", self.waitForConnect)
if self.waitForConnect then
- log:warn(" server=", self.waitForConnect.server)
- log:warn(" player=", self.waitForConnect.player)
+ log:info("waiting for ", player, " on ",
self.waitForConnect.server)
end
if self.waitForConnect and self.waitForConnect.player == player
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua?rev=4679&r1=4678&r2=4679&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua Wed Mar
4 03:25:14 2009
@@ -84,6 +84,7 @@
-- connection state
local UNCONNECTED = "UNCONNECTED" -- not connected
local CONNECTED = "CONNECTED" -- connected
+local CONNECTING = "CONNECTING" -- connecting
local function packNumber(v, len)
@@ -332,6 +333,7 @@
-- network state
obj.jnt = jnt
+ jnt:subscribe(obj)
-- reconnect timer
obj.reconnectTimer = Timer(0, function() _handleTimer(obj) end, true)
@@ -455,6 +457,8 @@
-- Don't allow connections to production SN yet
assert(not string.match(self.serverip, "www.squeezenetwork.com"))
+ log:info("connect to ", self.serverip)
+
self.socket = SocketTcp(self.jnt, self.serverip, PORT, "SlimProto")
-- connect
@@ -483,6 +487,8 @@
if self.state ~= CONNECTED then
return
end
+
+ log:info("disconnect")
self.state = UNCONNECTED
self.socket:close()
@@ -598,6 +604,7 @@
log:info("connection error: ", reason, ", reconnecting in ", (interval
/ 1000), " seconds")
self:disconnect()
+ self.state = CONNECTING
self.reconnectTimer:restart(interval)
end
@@ -612,6 +619,15 @@
end
+function notify_networkConnected(self)
+ if self.state ~= UNCONNECTED then
+ -- force reconnect
+ self:disconnect()
+ self:connect()
+ end
+end
+
+
--[[
=head1 LICENSE
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
