minor code tweaks; cell_id, cdn requests

steam/client/__init__.py

@@ -49,6 +49,7 @@ class SteamClient(CMClient, BuiltinBase):
     """After a new login key is accepted
     """
 
+    _LOG = logging.getLogger("SteamClient")
     _reconnect_backoff_c = 0
     current_jobid = 0
     credential_location = None         #: location for sentry
@@ -59,7 +60,6 @@ class SteamClient(CMClient, BuiltinBase):
     def __init__(self):
         CMClient.__init__(self)
 
-        self._LOG = logging.getLogger("SteamClient")
         # register listners
         self.on(self.EVENT_DISCONNECTED, self._handle_disconnect)
         self.on(self.EVENT_RECONNECT, self._handle_disconnect)
@@ -143,7 +143,7 @@ class SteamClient(CMClient, BuiltinBase):
             self.cm_servers.clear()
             self.cm_servers.merge_list(data['servers'])
             self.cm_servers.last_updated = data.get('last_updated', 0)
-            self.cm_servers.cell_id = data.get('cell_id', 0)
+            self.cell_id = self.cm_servers.cell_id = data.get('cell_id', 0)
 
     def _handle_cm_list(self, msg):
         if (self.cm_servers.last_updated + 3600*24 > time()

steam/client/cdn.py

@@ -178,7 +178,7 @@ def get_content_servers_from_webapi(cell_id, num_servers=20):
     :return: list of CS servers
     :rtype: :class:`list` [:class:`.ContentServer`]
     """
-    params = {'cellid': cell_id, 'max_servers': num_servers}
+    params = {'cell_id': cell_id, 'max_servers': num_servers}
     resp = webapi.get('IContentServerDirectoryService', 'GetServersForSteamPipe', params=params)
 
     servers = []
@@ -338,14 +338,16 @@ class CDNClient(object):
                 )
 
             try:
-                resp = self.web.get(url)
-            except:
-                pass
+                resp = self.web.get(url, timeout=10)
+            except Exception as exp:
+                self._LOG.debug("Request error: %s", exp)
             else:
                 if resp.ok:
                     return resp
-                elif resp.status_code >= 400:
+                elif 400 <= resp.status_code < 500:
+                    self._LOG.debug("Got HTTP %s", resp.status_code)
                     raise SteamError("HTTP Error %s" % resp.status_code)
+                self.steam.sleep(0.5)
 
             server = self.get_content_server(rotate=True)