diff --git a/Backend/SocketServices/BackendServices.cs b/Backend/SocketServices/BackendServices.cs index f2a311d5..d637f980 100644 --- a/Backend/SocketServices/BackendServices.cs +++ b/Backend/SocketServices/BackendServices.cs @@ -27,10 +27,13 @@ namespace Swarmops.Backend.SocketServices if (string.IsNullOrEmpty(serverRequest)) { + Console.WriteLine(" - echoing a message to all sessions"); // Not a server request, so just echo the contents to everybody Sessions.Broadcast(e.Data); } + Console.WriteLine(" - handling a socket message:" + serverRequest); + switch (serverRequest) { case "UpdateQueueCounts": diff --git a/FrontSocket/FrontendLoop.cs b/FrontSocket/FrontendLoop.cs index 5911de4e..c3a1ef1e 100644 --- a/FrontSocket/FrontendLoop.cs +++ b/FrontSocket/FrontendLoop.cs @@ -418,7 +418,7 @@ namespace Swarmops.Frontend.Socket public static void SendMessageUpstream(SocketMessage message) { JObject json = new JObject(); - json["ServerRequest"] = "Metapackage"; + json["BackendRequest"] = "Metapackage"; json["XmlData"] = message.ToXml(); _backendSocket.Send(json.ToString()); diff --git a/Site/Default.aspx.cs b/Site/Default.aspx.cs index f62bfa18..767c54e9 100644 --- a/Site/Default.aspx.cs +++ b/Site/Default.aspx.cs @@ -22,14 +22,6 @@ namespace Swarmops.Frontend // BEGIN TEST CODE - SocketMessage testMessage = new SocketMessage - { - MessageType = "Foo", - OrganizationId = 1 - }; - string messageXml = testMessage.ToXml(); - SocketMessage newMessage = SocketMessage.FromXml(messageXml); - // END TEST CODE InfoBoxLiteral =