Various bits of server tidying up.

[dcpomatic.git] / src / tools / dcpomatic_server_cli.cc

diff --git a/src/tools/dcpomatic_server_cli.cc b/src/tools/dcpomatic_server_cli.cc
index e9540ff70944a1570fc5d44aecbbdd7b154e50db..1ec985b4ba7c60d4c28f0b60c9d22cdcc2ed5dc9 100644 (file)
--- a/src/tools/dcpomatic_server_cli.cc
+++ b/src/tools/dcpomatic_server_cli.cc
@@ -98,6 +98,14 @@ main (int argc, char* argv[])
        Scaler::setup_scalers ();
        shared_ptr<FileLog> log (new FileLog ("dcpomatic_server_cli.log"));
        Server server (log, verbose);
-       server.run (num_threads);
+       try {
+               server.run (num_threads);
+       } catch (boost::system::system_error e) {
+               if (e.code() == boost::system::errc::address_in_use) {
+                       cerr << argv[0] << ": address already in use.  Is another DCP-o-matic server instance already running?\n";
+                       exit (EXIT_FAILURE);
+               }
+               cerr << argv[0] << ": " << e.what() << "\n";
+       }
        return 0;
 }