diff options
Diffstat (limited to 'lib/puppet/external/event-loop')
| -rw-r--r-- | lib/puppet/external/event-loop/event-loop.rb | 16 | ||||
| -rw-r--r-- | lib/puppet/external/event-loop/signal-system.rb | 4 |
2 files changed, 5 insertions, 15 deletions
diff --git a/lib/puppet/external/event-loop/event-loop.rb b/lib/puppet/external/event-loop/event-loop.rb index 06fa34607..bd278556c 100644 --- a/lib/puppet/external/event-loop/event-loop.rb +++ b/lib/puppet/external/event-loop/event-loop.rb @@ -141,16 +141,12 @@ class EventLoop def monitor_io (io, *events) for event in events do - unless monitoring_io?(io, event) - @ios[event] << io ; wake_up - end + @ios[event] << io ; wake_up unless monitoring_io?(io, event) end end def monitor_timer (timer) - unless monitoring_timer? timer - @timers << timer - end + @timers << timer unless monitoring_timer? timer end def check_timer (timer) @@ -264,9 +260,7 @@ class EventLoop::Timer @running = false @start_time = nil - if options.kind_of? Numeric - options = { :interval => options } - end + options = { :interval => options } if options.kind_of? Numeric if options[:interval] @interval = options[:interval].to_f @@ -301,9 +295,7 @@ class EventLoop::Timer def interval= (new_interval) old_interval = @interval @interval = new_interval - if new_interval < old_interval - @event_loop.check_timer(self) - end + @event_loop.check_timer(self) if new_interval < old_interval end def end_time diff --git a/lib/puppet/external/event-loop/signal-system.rb b/lib/puppet/external/event-loop/signal-system.rb index 8d97c4359..0ea3552f2 100644 --- a/lib/puppet/external/event-loop/signal-system.rb +++ b/lib/puppet/external/event-loop/signal-system.rb @@ -63,9 +63,7 @@ SignalEmitterClass = SignalEmitterModule module SignalEmitter def self.included (includer) - if not includer.kind_of? SignalEmitterClass - includer.extend SignalEmitterClass - end + includer.extend SignalEmitterClass if not includer.kind_of? SignalEmitterClass end def __maybe_initialize_signal_emitter |