Make set_options a little smarter: have options_act handle transitions on its own, and only dirty our descriptor when we really want to.

svn:r4802

1 files changed, 0 insertions, 10 deletions

diff --git a/src/or/control.c b/src/or/control.c
index 609d1f860..3e644382c 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -680,16 +680,6 @@ handle_control_setconf(connection_t *conn, uint32_t len, char *body)
     config_free_lines(lines);
     return 0;
   }
-
-  if (options_act() < 0) { /* acting on them failed. die. */
-    log_fn(LOG_ERR,"Acting on config options left us in a broken state. Dying.");
-    exit(1);
-  }
-  if (options_transition_affects_workers(lines)) {
-    log_fn(LOG_INFO,"Worker-related options changed. Rotating workers.");
-    cpuworkers_rotate();
-    dnsworkers_rotate();
-  }
   config_free_lines(lines);
   send_control_done(conn);
   return 0;