diff options
| author | ytti <saku@ytti.fi> | 2018-04-27 18:23:24 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-27 18:23:24 +0300 |
| commit | 9afd5fe024a4ad5058626d2412719e7888104964 (patch) | |
| tree | b0eaa466bbb3d0b28e9a5ca99b0f855f2ccd07b8 /lib/oxidized/input | |
| parent | 41c7e965e0f78600d4baf2da1e4720f44c06233c (diff) | |
| parent | ae9c7c2a65d65bea136669bc9cbc2d645841a017 (diff) | |
Merge pull request #1315 from wk/potato-potato
transition from TimeoutError to Timeout::Error
Diffstat (limited to 'lib/oxidized/input')
| -rw-r--r-- | lib/oxidized/input/telnet.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/oxidized/input/telnet.rb b/lib/oxidized/input/telnet.rb index 4371e26..b1b3222 100644 --- a/lib/oxidized/input/telnet.rb +++ b/lib/oxidized/input/telnet.rb @@ -102,7 +102,7 @@ class Net::Telnet rest = '' until prompt === line and not IO::select([@sock], nil, nil, waittime) unless IO::select([@sock], nil, nil, time_out) - raise TimeoutError, "timed out while waiting for more data" + raise Timeout::Error, "timed out while waiting for more data" end begin c = @sock.readpartial(1024 * 1024) |