added status

peterc23 · Jul 9, 2012 · 2b9e09d · 2b9e09d
1 parent a0eebe3
commit 2b9e09d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/tracker/db/dbPeers.js b/tracker/db/dbPeers.js
@@ -45,9 +45,9 @@ function updatePeerStatusById(peerInfo, callback){
 }
 
 function getAllPeerInfo(callback){
-    client.executeFindMultipleQuery('SELECT * FROM ?', [tableProperties.PEERS_TABLE] ,createPeerInfoFromSingleResult,
+    client.executeFindMultipleQuery('SELECT * FROM ' + tableProperties.PEERS_TABLE, [] ,createPeerInfoFromSingleResult,
         function(peersList){
-            return peersList;
+            callback(peersList);
         });
 }
 

diff --git a/tracker/handlers/peersRequestHandler.js b/tracker/handlers/peersRequestHandler.js
@@ -63,7 +63,13 @@ function getStatus (req, res){
            if(typeof peerInfoList == 'undefined'){
                res.send(errCodes.ERR_CANNOT_RETRIEVE_PEERS, 400);
            }else{
-               res.send(peerInfoList, 200);
+               var returnList = [];
+               for(var i=0; i< peerInfoList.length; i++){
+                   if (peerInfoList[i][tableProperties.PEERS_STATUS] == tableProperties.PEERS_CONNECTED){
+                       returnList.push(peerInfoList[i]);
+                   }
+               }
+               res.send(returnList, 200);
            }
         });
     }catch(err){

diff --git a/tracker/index.js b/tracker/index.js
@@ -17,21 +17,21 @@ app.configure(function() {
 });
 
 //handler for Peers
-app.post("/peer/join", peersRequestHandler.join);
-app.post("/peer/leave", peersRequestHandler.leave);
+app.post("/peer/join", writeBackBoneHeaders, peersRequestHandler.join);
+app.post("/peer/leave", writeBackBoneHeaders, peersRequestHandler.leave);
 
-app.get("/peer/status", peersRequestHandler.getStatus);
+app.get("/peer/status", writeBackBoneHeaders, peersRequestHandler.getStatus);
 
 
 
 //handler for Files
-app.post("/file/insert", fileSystemRequestHandler.insert);
-app.post("/file/delete", fileSystemRequestHandler.delete);
-app.post("/file/read", fileSystemRequestHandler.read);
-app.post("/file/write", fileSystemRequestHandler.write);
-app.post("/file/update", fileSystemRequestHandler.fileReieved);
+app.post("/file/insert", writeBackBoneHeaders, fileSystemRequestHandler.insert);
+app.post("/file/delete", writeBackBoneHeaders, fileSystemRequestHandler.delete);
+app.post("/file/read", writeBackBoneHeaders, fileSystemRequestHandler.read);
+app.post("/file/write", writeBackBoneHeaders, fileSystemRequestHandler.write);
+app.post("/file/update", writeBackBoneHeaders, fileSystemRequestHandler.fileReieved);
 
-app.get("/file/status", fileSystemRequestHandler.getStatus);
+app.get("/file/status", writeBackBoneHeaders, fileSystemRequestHandler.getStatus);
 
 app.post("/test", writeBackBoneHeaders, fileSystemRequestHandler.test);