Merge branch 'master' into recodex-judge

ReCodEx · May 31, 2018 · 6936ffa · 6936ffa
2 parents 7c7f0b6 + 1ab1daa
commit 6936ffa
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/recodex-worker.spec b/recodex-worker.spec
@@ -1,8 +1,8 @@
 %define name recodex-worker
 %define short_name worker
 %define version 1.4.1
-%define unmangled_version 72f6cb41b5d37b4093e3181b2e37209a6a3087f5
-%define release 1
+%define unmangled_version 1d19a029d0758fbefb28164063384f0a1a03ef77
+%define release 2
 
 %define spdlog_name spdlog
 %define spdlog_version 0.13.0

diff --git a/src/config/worker_config.cpp b/src/config/worker_config.cpp
@@ -147,7 +147,7 @@ worker_config::worker_config(const YAML::Node &config)
 			try {
 				auto bound_dirs = helpers::get_bind_dirs(limits);
 				limits_.add_bound_dirs(bound_dirs);
-			} catch (helpers::config_exception e) {
+			} catch (helpers::config_exception &e) {
 				throw config_error(e.what());
 			}
 

diff --git a/src/connection_proxy.h b/src/connection_proxy.h
@@ -92,7 +92,7 @@ class connection_proxy
 			auto time_after_poll = std::chrono::system_clock::now();
 
 			elapsed_time = std::chrono::duration_cast<std::chrono::milliseconds>(time_after_poll - time_before_poll);
-		} catch (zmq::error_t) {
+		} catch (zmq::error_t &) {
 			terminate = true;
 			return;
 		}

diff --git a/src/helpers/zmq_socket.cpp b/src/helpers/zmq_socket.cpp
@@ -21,7 +21,7 @@ bool helpers::recv_from_socket(zmq::socket_t &socket, std::vector<std::string> &
 
 		try {
 			retval = socket.recv(&msg);
-		} catch (zmq::error_t) {
+		} catch (zmq::error_t &) {
 			if (terminate != nullptr) { *terminate = true; }
 			retval = false;
 		}

diff --git a/src/job/job.cpp b/src/job/job.cpp
@@ -276,7 +276,7 @@ void job::connect_tasks(
 				auto ptr = unconn_tasks.at(depend.at(i));
 				ptr->add_children(elem.second);
 				elem.second->add_parent(ptr);
-			} catch (std::out_of_range) {
+			} catch (std::out_of_range &) {
 				throw job_exception("Non existing task-id (" + depend.at(i) + ") in dependency list");
 			}
 		}
@@ -382,7 +382,7 @@ void job::init_logger()
 		file_logger->info("       Job system log");
 		file_logger->info("------------------------------");
 		logger_ = file_logger;
-	} catch (spdlog::spdlog_ex) {
+	} catch (spdlog::spdlog_ex &) {
 		// Suppose not happen. But in case, create only empty logger.
 		logger_ = helpers::create_null_logger();
 	}