Skip to content
Snippets Groups Projects

Minor fixes on test instance

Merged Minor fixes on test instance
shammash/djrandom:master into master
Merged shammash requested to merge shammash/djrandom:master into master
Viewing commit cc2a6497
Next
Show latest version
1 file
+ 7
− 7
Compare changes
  • Side-by-side
  • Inline
  • cc2a6497
    shammash
    Use 127.0.0.1 instead of localhost · cc2a6497
    shammash authored 
    git.autistici.org/ale/rrpc uses net.LookupIP() , which returns link-local
addresses but truncates the IPv6 zone from them. This makes it impossible to
use the 'localhost' name with link-local addresses. Use the address directly
instead. A much better solution would be to fix rrpc for good.

Signed-off-by: default avatarshammash <shammash@autistici.org>
test.sh
+ 7
− 7
@@ -24,16 +24,16 @@ generate_server_conf() {
cat >$1 <<EOF
{
"db_path": "${root}/djrandom.db",
"db_addr": "localhost:3007",
"db_addr": "127.0.0.1:3007",
"storage_root": "${root}/fs",
"storage_pmap": "${root}/part.json",
"storage_self": "http://localhost:3003",
"storage_self": "http://127.0.0.1:3003",
"storage_key_id": "abcdef",
"storage_key_secret": "123456",
"index_pmap": "${root}/part-index.json",
"index_self": "localhost:3002",
"index_self": "127.0.0.1:3002",
"index_file": "${root}/djindex",
"task_server_addr": "http://localhost:3005",
"task_server_addr": "http://127.0.0.1:3005",
"last_fm_api_key": "1234"
}
EOF
@@ -44,7 +44,7 @@ generate_client_conf() {
{
"music_dir": "${music_dir}",
"db_path": "${root}/djclient.db",
"server": "http://localhost:3001",
"server": "http://127.0.0.1:3001",
"auth_key": "${auth_key}",
"auth_secret": "${auth_secret}"
}
@@ -52,11 +52,11 @@ EOF
}
generate_storage_part() {
${bindir}/parttool --parts=16 --file=$1 create http://localhost:3003
${bindir}/parttool --parts=16 --file=$1 create http://127.0.0.1:3003
}
generate_index_part() {
${bindir}/parttool --parts=16 --file=$1 create localhost:3002
${bindir}/parttool --parts=16 --file=$1 create 127.0.0.1:3002
}
start_daemons() {