Pass Me2Me config via stdin.

remoting/host/remoting_me2me_host.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.
 //
 // This file implements a standalone host process for Me2Me.
 
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
@@ skipping 36 matching lines @@
 #include "remoting/host/log_to_server.h"
 #include "remoting/host/network_settings.h"
 #include "remoting/host/policy_hack/policy_watcher.h"
 #include "remoting/host/session_manager_factory.h"
 #include "remoting/host/signaling_connector.h"
 #include "remoting/host/usage_stats_consent.h"
 #include "remoting/host/video_frame_capturer.h"
 #include "remoting/jingle_glue/xmpp_signal_strategy.h"
 #include "remoting/protocol/me2me_host_authenticator_factory.h"
 
+#if defined(OS_POSIX)
+#include <signal.h>
+#include "remoting/host/posix/signal_handler.h"
+#endif  // defined(OS_POSIX)
+
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "remoting/host/curtain_mode_mac.h"
 #endif  // defined(OS_MACOSX)
 
 #if defined(OS_POSIX)
 #include <signal.h>
 #endif  // defined(OS_POSIX)
 
@@ skipping 77 matching lines @@
     FilePath default_config_dir = remoting::GetConfigDir();
     host_config_path_ = default_config_dir.Append(kDefaultHostConfigFile);
     if (cmd_line->HasSwitch(kHostConfigSwitchName)) {
       host_config_path_ = cmd_line->GetSwitchValuePath(kHostConfigSwitchName);
     }
 #endif  // !defined(REMOTING_MULTI_PROCESS)
 
     return true;
   }
 
+#if defined(OS_POSIX)
+  void SigTermHandler(int signal_number) {
+    DCHECK(signal_number == SIGTERM);
+    DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
+    LOG(INFO) << "Caught SIGTERM: Shutting down...";
+    Shutdown(kSuccessExitCode);
+  }
+#endif
+
   virtual void OnConfigUpdated(const std::string& serialized_config) OVERRIDE {
     DCHECK(context_->ui_task_runner()->BelongsToCurrentThread());
 
     LOG(INFO) << "Processing new host configuration.";
 
     if (!config_.SetSerializedData(serialized_config)) {
       LOG(ERROR) << "Invalid configuration.";
       OnConfigWatcherError();
       return;
     }
@@ skipping 46 matching lines @@
         FROM_HERE,
         base::Bind(&HostProcess::Shutdown, base::Unretained(this),
                    kInvalidHostConfigurationExitCode));
   }
 
   void StartWatchingConfigChanges() {
 #if !defined(REMOTING_MULTI_PROCESS)
 
 #if defined(OS_POSIX)
     // Ignore SIGHUP sent by the daemon controller since we use
-    // |ConfigFileWatcher| instead.
+    // |ConfigFileWatcher| on Mac and Windows and read the config
+    // from stdin on UNIX.
     signal(SIGHUP, SIG_IGN);
 #endif  // defined(OS_POSIX)
 
     // Start watching the host configuration file.
     config_watcher_.reset(new ConfigFileWatcher(context_->ui_task_runner(),
                                                 context_->file_task_runner(),
                                                 this));
     config_watcher_->Watch(host_config_path_);
 #endif  // !defined(REMOTING_MULTI_PROCESS)
   }
 
+#if defined(OS_POSIX)
+  void ListenForShutdownSignal() {
+    remoting::RegisterSignalHandler(
+        SIGTERM,
+        base::Bind(&HostProcess::SigTermHandler, base::Unretained(this)));
+  }
+#endif  // OS_POSIX
+
   void CreateAuthenticatorFactory() {
     DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
     scoped_ptr<protocol::AuthenticatorFactory> factory(
         new protocol::Me2MeHostAuthenticatorFactory(
             key_pair_.GenerateCertificate(),
             *key_pair_.private_key(), host_secret_hash_));
     host_->SetAuthenticatorFactory(factory.Pass());
   }
 
   // IPC::Listener implementation.
@@ skipping 14 matching lines @@
   }
 
   void StartHostProcess() {
     DCHECK(context_->ui_task_runner()->BelongsToCurrentThread());
 
     if (!InitWithCommandLine(CommandLine::ForCurrentProcess())) {
       OnConfigWatcherError();
       return;
     }
 
+#if defined(OS_POSIX)
+    context_->network_task_runner()->PostTask(
+        FROM_HERE,
+        base::Bind(&HostProcess::ListenForShutdownSignal,

[alexeypa (please no reviews), 2012/09/06 18:21:10]

nit: You can bind to remoting::RegisterSignalHandler directly here.

+                   base::Unretained(this)));
+#endif  // OS_POSIX
+
     StartWatchingConfigChanges();
   }
 
   int get_exit_code() const { return exit_code_; }
 
  private:
   void ShutdownHostProcess() {
     DCHECK(context_->ui_task_runner()->BelongsToCurrentThread());
 
 #if !defined(REMOTING_MULTI_PROCESS)
@@ skipping 503 matching lines @@
             user32.GetFunctionPointer("SetProcessDPIAware"));
     set_process_dpi_aware();
   }
 
   // CommandLine::Init() ignores the passed |argc| and |argv| on Windows getting
   // the command line from GetCommandLineW(), so we can safely pass NULL here.
   return main(0, NULL);
 }
 
 #endif  // defined(OS_WIN)