diff options
author | tv <tv@also> | 2011-07-31 04:19:55 +0200 |
---|---|---|
committer | tv <tv@also> | 2011-07-31 04:19:55 +0200 |
commit | 60b0d4ef38a8820023d30e42a038ef962ad6d9e5 (patch) | |
tree | c9d98e31835d9480f17c4e54846032285d5c42f5 | |
parent | b67f8696e3f071522347206240300059e3bb9081 (diff) | |
parent | 1d37bfa3cd18113fbcaf7f04b790f4b7ccea1199 (diff) |
Merge branch 'master' of github.com:krebscode/painload
-rwxr-xr-x | btc/mtgox/mtgox.getDepth | 2 | ||||
-rwxr-xr-x | btc/mtgox/mtgox.getTrades | 2 | ||||
-rwxr-xr-x | btc/mtgox/mtgox.ticker | 2 | ||||
-rwxr-xr-x | people/arping.py | 4 |
4 files changed, 4 insertions, 6 deletions
diff --git a/btc/mtgox/mtgox.getDepth b/btc/mtgox/mtgox.getDepth index 7401d532..9a607979 100755 --- a/btc/mtgox/mtgox.getDepth +++ b/btc/mtgox/mtgox.getDepth @@ -1,3 +1,3 @@ #! /bin/sh # get mtgox market depth -wget -qO- http://mtgox.com/code/data/getDepth.php +$ curl -ksS https://mtgox.com/code/data/getDepth.php diff --git a/btc/mtgox/mtgox.getTrades b/btc/mtgox/mtgox.getTrades index 4901e379..73e5a68d 100755 --- a/btc/mtgox/mtgox.getTrades +++ b/btc/mtgox/mtgox.getTrades @@ -1,3 +1,3 @@ #! /bin/sh # get mtgox last trades -wget -qO- http://mtgox.com/code/data/getTrades.php +$ curl -ksS https://mtgox.com/code/data/getTrades.phl diff --git a/btc/mtgox/mtgox.ticker b/btc/mtgox/mtgox.ticker index bbfcc52d..b24dfb35 100755 --- a/btc/mtgox/mtgox.ticker +++ b/btc/mtgox/mtgox.ticker @@ -1,4 +1,4 @@ #! /bin/sh # get mtgox ticker data set -euf -wget -qO- http://mtgox.com/code/data/ticker.php +curl -ksS https://mtgox.com/code/data/ticker.php diff --git a/people/arping.py b/people/arping.py index 1b51ab1b..3245f1ee 100755 --- a/people/arping.py +++ b/people/arping.py @@ -27,9 +27,7 @@ try: return [] except Exception as e: - log.error("Cannot load arping functions!" + str(e)) - def arpingy(iprange='',iface=''): - raise Exception ('arping not available') + raise Exception("Cannot load arping functions!" + str(e)) if __name__ =='__main__': |