From e2f56d8e5428e1d18596c229aae8b62cd6bc9ecc Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 3 Dec 2014 09:27:53 +0000 Subject: [PATCH] Hand-apply 63b62aa703c2628b27b577114081b265f237dadb from master; fix missing parameter in log entry. --- TO_PORT | 1 - src/lib/encoder.cc | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/TO_PORT b/TO_PORT index be2532019..4dfb76788 100644 --- 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 0c9faa70d..96fda7cc2 100644 --- 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))); } -- 2.30.2