Hand-apply 63b62aa703c2628b27b577114081b265f237dadb from master;

fix missing parameter in log entry.

diff --git a/TO_PORT b/TO_PORT
index be25320194ff6c4f12f3db36cd33ec7de0db5bb6..4dfb76788ca4cbac9d67de12e73e42e981f65da3 100644 (file)
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,4 +1,3 @@
-05c421741efc303a3248faeae56f9a23e280eeb9
 65c5c51161a862cb77198472940b756b2d18aa87
 6b811225da349c1a0bc570b886833c31bb5744f7
 0b2c8aee63b691a08b01d9d59e810c2e6c1e6c1b

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 0c9faa70d331bb722d70ffd17ba924456e344133..96fda7cc243a859b9c5785c70eb33e44f997f570 100644 (file)
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -80,7 +80,7 @@ Encoder::~Encoder ()
 void
 Encoder::add_worker_threads (ServerDescription d)
 {
-       LOG_GENERAL (N_("Adding %1 worker threads for remote %2"), d.host_name ());
+       LOG_GENERAL (N_("Adding %1 worker threads for remote %2"), d.threads(), d.host_name ());
        for (int i = 0; i < d.threads(); ++i) {
                _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, d)));
        }