plr-speedtest 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e37d03e016955b5ce893aa87d117b5e5fb797bbd87756418c8bd6f4c6f127ffe
-  data.tar.gz: a8b5d4f80ea96ef5a526969fb4652509d26ffe81821a0531854b8fda2270bccc
+  metadata.gz: 40cc60df27a2cccc797e878a5cefd622d0eee64a7a943b506c4f3f7870fb2acb
+  data.tar.gz: 745b880ab6bb3de64616f52f41d44376338f511e61d09b55a595b96d789be1c7
 SHA512:
-  metadata.gz: 53456327b24e161a54775411def4e8ca19df19def67f68e39e515d1d1f295325bc106f631bfe47836d44d1953368fc58c3fe1bb02d495af978f0d4c5be73adc5
-  data.tar.gz: 241016c035003d8ad6db32d025947faadcd08345cdd2d045d4a4499181dfd4368163c9fa44aebd6f5983fb6069dd8b2bba438815084c4653f414aae4b5eeeaf2
+  metadata.gz: 79026a0c8bd4e447ce0de7152bfb2671b66c21cb365ba07646778be7c244008301e93fb34933a2e09cc3b87f930ae05f60e2f5c1f87d36188cec09c07af0dbf1
+  data.tar.gz: c5537556243ec50cab9ce90f7acc97a6d9c111631e61d84e159405cdc09f9c773b11dd52a24744ff866819c6a5c81bdc6e8a2c30b87c81a754b9613e444982dc

data/lib/speedtest.rb

@@ -206,7 +206,7 @@ module Speedtest
         begin
           page = HTTParty.get("#{server}/speedtest/latency.txt", timeout: HTTP_PING_TIMEOUT)
           times << Time.new - start
-        rescue Timeout::Error, Net::HTTPNotFound, Errno::ENETUNREACH => e
+        rescue Timeout::Error, Net::HTTPNotFound, Net::OpenTimeout, Errno::ENETUNREACH => e
           log "ping error: #{e.class} [#{e}] for #{server}"
           times << 999999
         end

data/lib/speedtest/transfer_worker.rb

@@ -14,12 +14,17 @@ module Speedtest
       log "  downloading: #{@url}"
       status = ThreadStatus.new(false, 0)
 
-      page = HTTParty.get(@url, timeout: 10)
-      unless page.code / 100 == 2
-        error "GET #{@url} failed with code #{page.code}"
+      begin
+        page = HTTParty.get(@url, timeout: 10)
+        unless page.code / 100 == 2
+          error "GET #{@url} failed with code #{page.code}"
+          status.error = true
+        end
+        status.size = page.body.length
+      rescue Timeout::Error, Net::HTTPNotFound, Net::OpenTimeout, Errno::ENETUNREACH => e
+        error "GET #{@url} failed with exception #{e.class}"
         status.error = true
       end
-      status.size = page.body.length
       status
     end
 
@@ -27,12 +32,17 @@ module Speedtest
       log "  uploading: #{@url}"
       status = ThreadStatus.new(false, 0)
 
-      page = HTTParty.post(@url, :body => { "content" => content }, timeout: 10)
-      unless page.code / 100 == 2
-        error "GET #{@url} failed with code #{page.code}"
+      begin
+        page = HTTParty.post(@url, :body => { "content" => content }, timeout: 10)
+        unless page.code / 100 == 2
+          error "POST #{@url} failed with code #{page.code}"
+          status.error = true
+        end
+        status.size = page.body.split('=')[1].to_i
+      rescue Timeout::Error, Net::HTTPNotFound, Net::OpenTimeout, Errno::ENETUNREACH => e
+        error "POST #{@url} failed with exception #{e.class}"
         status.error = true
       end
-      status.size = page.body.split('=')[1].to_i
       status
     end
   end

data/lib/speedtest/version.rb

@@ -1,3 +1,3 @@
 module Speedtest
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plr-speedtest
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Pete Myron
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-06 00:00:00.000000000 Z
+date: 2018-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty