Host offline status reporting.

remoting/host/server_log_entry.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/server_log_entry.h"
 
 #include "base/logging.h"
 #include "base/strings/stringize_macros.h"
 #include "base/sys_info.h"
 #include "remoting/base/constants.h"
 #include "remoting/protocol/session.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 
 using base::SysInfo;
 using buzz::QName;
 using buzz::XmlElement;
 using remoting::protocol::Session;
 
 namespace remoting {
 
 namespace {
 const char kLogCommand[] = "log";
 
 const char kLogEntry[] = "entry";
 
 const char kKeyEventName[] = "event-name";
 const char kValueEventNameSessionState[] = "session-state";
 const char kValueEventNameHeartbeat[] = "heartbeat";
+const char kValueEventNameHostStatus[] = "host-status";
 
 const char kKeyRole[] = "role";
 const char kValueRoleHost[] = "host";
 
 const char kKeyMode[] = "mode";
 const char kValueModeIt2Me[] = "it2me";
 const char kValueModeMe2Me[] = "me2me";
 
 const char kKeySessionState[] = "session-state";
 const char kValueSessionStateConnected[] = "connected";
@@ skipping 38 matching lines @@
 }
 
 // static
 scoped_ptr<ServerLogEntry> ServerLogEntry::MakeForHeartbeat() {
   scoped_ptr<ServerLogEntry> entry(new ServerLogEntry());
   entry->Set(kKeyRole, kValueRoleHost);
   entry->Set(kKeyEventName, kValueEventNameHeartbeat);
   return entry.Pass();
 }
 
+// static
+scoped_ptr<ServerLogEntry> ServerLogEntry::MakeForHostStatus() {
+  scoped_ptr<ServerLogEntry> entry(new ServerLogEntry());
+  entry->Set(kKeyRole, kValueRoleHost);
+  entry->Set(kKeyEventName, kValueEventNameHostStatus);
+  return entry.Pass();
+}
+
 void ServerLogEntry::AddHostFields() {
 #if defined(OS_WIN)
   Set(kKeyOsName, kValueOsNameWindows);
 #elif defined(OS_MACOSX)
   Set(kKeyOsName, kValueOsNameMac);
 #elif defined(OS_CHROMEOS)
   Set(kKeyOsName, kValueOsNameChromeOS);
 #elif defined(OS_LINUX)
   Set(kKeyOsName, kValueOsNameLinux);
 #endif
@@ skipping 31 matching lines @@
     case IT2ME:
       return kValueModeIt2Me;
     case ME2ME:
       return kValueModeMe2Me;
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
+void ServerLogEntry::AddCustomField(const std::string& name,

[rmsousa, 2013/07/09 03:13:41]

Could you pass the host_status and exit_code values as enums in the
MakeForHostStatus() constructor (and translate inside it), rather than adding a
generic key/value setter?

[weitao, 2013/07/09 19:02:17]

I think the ServerLogEntry class should be general purpose and shouldn't need to
know the details (attribute names, etc) of individual log entries created for
different kind of messages. It should be up to the consumers of ServerLogEntry
to add these name/value pairs. 

I am actually planning to submit a separate change to clean this up: hoisting
all the session state and heartbeat specific attribute references up to the
caller.

On 2013/07/09 03:13:41, rmsousa wrote:

+                                    const std::string& value) {
+  Set(name, value);
+}
+
 scoped_ptr<XmlElement> ServerLogEntry::ToStanza() const {
   scoped_ptr<XmlElement> stanza(new XmlElement(QName(
       kChromotingXmlNamespace, kLogEntry)));
   ValuesMap::const_iterator iter;
   for (iter = values_map_.begin(); iter != values_map_.end(); ++iter) {
     stanza->AddAttr(QName(std::string(), iter->first), iter->second);
   }
   return stanza.Pass();
 }
 
 // static
 const char* ServerLogEntry::GetValueSessionState(bool connected) {
   return connected ? kValueSessionStateConnected : kValueSessionStateClosed;
 }
 
 void ServerLogEntry::Set(const std::string& key, const std::string& value) {
   values_map_[key] = value;
 }
 
 }  // namespace remoting