Commit Graph

3368 Commits

Author SHA1 Message Date
Matt Bell
706ebe8d24 daemon: Set allowed API origins in API_ORIGIN environment variable 2014-11-25 06:12:35 -08:00
Matt Bell
aaab7d0898 commands/http: Allow API requests from whitelisted origins 2014-11-25 06:12:35 -08:00
Brian Tiger Chow
2497c93897 log(core) bootstrapping error -> critical
License: MIT
Signed-off-by: Brian Tiger Chow <brian@perfmode.com>
2014-11-25 06:12:35 -08:00
Brian Tiger Chow
4831ca6d57 refactor(config) use util method
License: MIT
Signed-off-by: Brian Tiger Chow <brian@perfmode.com>
2014-11-25 06:12:35 -08:00
Brian Tiger Chow
18202166e3 Merge pull request #385 from chriscool/update_maybebtc_logrus
Update github.com/maybebtc/logrus dependency
2014-11-24 22:41:03 -08:00
Christian Couder
9d7d02c21c Update github.com/maybebtc/logrus dependency
This patch was generated by running:

$ godep update github.com/maybebtc/logrus

Without this, `godep restore` fails like this:

```
$ LANG=C godep restore
fatal: reference is not a tree: 005463f8fb49c4a6f36181e05157e111ec5cf8a3
godep: restore: exit status 128
```

License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2014-11-25 06:44:46 +01:00
Brian Tiger Chow
ca3e83016c Merge pull request #380 from jbenet/fix/eventlog-init-condition
fix(eventlog) initialization
2014-11-24 16:14:19 -08:00
Brian Tiger Chow
90ed148209 fix(eventlog) apply settings upon initialization
This commit applies the logging settings to the logging system upon
initialization `ipfs init` and `ipfs daemon --init`.

License: MIT
Signed-off-by: Brian Tiger Chow <brian@perfmode.com>
2014-11-24 16:05:51 -08:00
Brian Tiger Chow
4d497f1c6e refactor(repo) mv ConfigureLogger to repo package
License: MIT
Signed-off-by: Brian Tiger Chow <brian@perfmode.com>

Conflicts:
	cmd/ipfs/main.go
2014-11-24 16:05:51 -08:00
Brian Tiger Chow
2c38487eb0 fix(eventlog) configure logging if repo is initialized
License: MIT
Signed-off-by: Brian Tiger Chow <brian@perfmode.com>
2014-11-24 16:05:51 -08:00
Juan Batiz-Benet
6c94a0715f Merge pull request #379 from chriscool/fix/nil-options
Add sharness tests for ipfs add and cat
2014-11-24 11:33:02 -05:00
Christian Couder
5e133a136c Add sharness tests for ipfs add and cat
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2014-11-23 21:02:39 +01:00
Juan Batiz-Benet
6b615478a3 Merge pull request #374 from chriscool/make_test_expensive
Add test_expensive target to the main Makefile
2014-11-23 10:45:56 -05:00
Juan Batiz-Benet
cd914c11a9 Merge pull request #378 from dborzov/fix/nil-options
Hotfix: return parsed options if argument parsing failed
2014-11-23 10:42:24 -05:00
Peter Borzov
a76bac0dcc Hotfix: return parsed options if argument parsing failed 2014-11-23 05:56:29 -05:00
Brian Tiger Chow
f6c656c7d2 Merge pull request #375 from chriscool/fix_dot_gitignore
Remove dot and slash before files in cmd/ipfs/.gitignore
2014-11-22 22:24:41 -08:00
Christian Couder
8b8b6ce9e2 Remove dot and slash before files in cmd/ipfs/.gitignore
It looks like files are not ignored when they are listed
starting with ./ in a .gitignore file.

At least this is true for me on Linux for the "ipfs"
binary in "cmd/ipfs/.gitignore".

License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2014-11-22 21:55:12 +01:00
Christian Couder
3edbadd120 Add test_expensive target to the main Makefile
Now 'make test' will run the go tests with option -test.short
and the sharness tests without any option.

And 'make test_expensive' will run the go tests without any
option and the sharness tests with option TEST_EXPENSIVE=1.

This should help fix the first part of issue #283.

License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2014-11-22 16:08:24 +01:00
Jeromy
34da5f039c log formatting (info -> infof) 2014-11-21 03:54:26 +00:00
Juan Batiz-Benet
8bf7948722 Merge pull request #369 from jbenet/utp
Add utp as a transport
2014-11-20 18:39:18 -08:00
Brian Tiger Chow
c3fd9b5b20 feat(Dockerfile) expose UDP 4002 for swarm traffic
License: MIT
Signed-off-by: Brian Tiger Chow <brian@perfmode.com>
2014-11-20 16:27:39 -08:00
Brian Tiger Chow
93cf2bb176 style(net/conn) fmt -> debugerror
License: MIT
Signed-off-by: Brian Tiger Chow <brian@perfmode.com>
2014-11-20 16:14:23 -08:00
Juan Batiz-Benet
6adfa35c3e Merge pull request #371 from chriscool/test_add_expensive_prereq
Add EXPENSIVE prereq to sharness tests
2014-11-20 12:03:23 -08:00
Christian Couder
196651d5f5 Add sharness mount tests with a 5 MB file
These new tests are not marked EXPENSIVE as they
should be fast enough even on Travis CI.

License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2014-11-20 20:46:02 +01:00
Christian Couder
c8e7a95644 Add an EXPENSIVE prereq and use it in t0040
We add this prereq to tests with a 100MB file
as they are slow on Travis CI.

License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2014-11-20 20:27:09 +01:00
Christian Couder
f06b9ca126 Rename test_launch_ipfs_mount into test_launch_ipfs_daemon_and_mount
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2014-11-20 20:11:03 +01:00
Christian Couder
1e077828cb Rename test_kill_ipfs_mount into test_kill_ipfs_daemon
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2014-11-20 20:03:41 +01:00
Juan Batiz-Benet
a1dcbbad80 init: note about addrs 2014-11-20 09:15:48 -08:00
Juan Batiz-Benet
f99117bcd2 swarm: try all peer's addresses
For simplicity this is sequential. This will be bad latency given
RTTs for all the handshakes, etc. Later on can make async or
at least open based on some priority of the channel.
2014-11-20 09:14:49 -08:00
Juan Batiz-Benet
48879dd56c conn: added (*dialer).DialAddr 2014-11-20 09:14:49 -08:00
Juan Batiz-Benet
c7fd1d9ddb swarm: refactored multiconn creation 2014-11-20 09:14:49 -08:00
Juan Batiz-Benet
e0dab75d54 swarm: better err on listen fail 2014-11-20 09:14:48 -08:00
Juan Batiz-Benet
c90c16eee4 updated multiaddr + added utp 2014-11-20 09:14:48 -08:00
Juan Batiz-Benet
8786602df1 config: nicer error to user 2014-11-20 09:14:48 -08:00
Juan Batiz-Benet
1a5cb300cb config: swarm is list of addrs 2014-11-20 09:14:48 -08:00
Juan Batiz-Benet
fc6bab7b73 net/conn: moved zero addr error 2014-11-20 01:27:18 -08:00
Juan Batiz-Benet
43452fdeb7 updated multiaddr + multiaddr-net
I broke out multiaddr/net to its own package so
that multiaddr parsing could remain lean. multiaddr-net
will vendor special implementations of protocols (like utp)
2014-11-20 00:58:48 -08:00
Juan Batiz-Benet
e1be96133c Merge pull request #366 from jbenet/parse-fix
Parse Fix
2014-11-20 00:25:41 -08:00
Matt Bell
922f84878c commands/cli: Added argument parse tests 2014-11-19 18:30:06 -08:00
Matt Bell
a69ddbb965 commands/cli: Fixed parse bug when optional argument is defined first 2014-11-19 18:29:56 -08:00
Juan Batiz-Benet
cefb0140cb Merge pull request #362 from chriscool/mount_bugs
Add sharness tests to document existing mount bugs
2014-11-19 13:03:49 -08:00
Christian Couder
882aac223e Add issue number to expected failures in sharness tests
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2014-11-19 21:21:03 +01:00
ᴍᴀᴛᴛ ʙᴇʟʟ
b38f01ed68 Merge pull request #365 from jbenet/windows-hotfixes
Windows Hotfixes
2014-11-19 05:39:52 -08:00
Matt Bell
ab16237bc7 core/commands: Added no-op Mount implementation for Windows 2014-11-19 05:29:48 -08:00
Matt Bell
4bd2fbc806 commands/cli: Ignore stdin on Windows 2014-11-19 04:30:29 -08:00
Matt Bell
7b09b7bdaf Merge pull request #364 from jbenet/pin-ls
Added 'pin ls' Command
2014-11-19 03:28:27 -08:00
Matt Bell
5461d76957 core/commands: Better syntax for 'pin ls' option value handling 2014-11-19 03:23:21 -08:00
Matt Bell
928f20b4bd core/commands: pin ls: Default type to 'direct' 2014-11-19 01:44:51 -08:00
Matt Bell
69ce2940a8 commands/cli: Fixed helptext option type 2014-11-19 00:54:59 -08:00
Matt Bell
9de01007d0 core/commands: pin ls: Accept 'type' option to specify type of pinned keys to list 2014-11-19 00:53:57 -08:00