diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-11-03 21:20:07 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-11-03 21:20:07 +0000 |
commit | 1911cc508e10a4052499ba41e565edf57184daf7 (patch) | |
tree | 75baa9795123ffcdf8c12e86705cfa3f31cf37a0 /src | |
parent | 236e47e55554310cc19b8c37c7b844d53a239f28 (diff) | |
download | gnunet-1911cc508e10a4052499ba41e565edf57184daf7.tar.gz gnunet-1911cc508e10a4052499ba41e565edf57184daf7.zip |
use new quota parsing capabilities -- SVN 1875
Diffstat (limited to 'src')
22 files changed, 23 insertions, 23 deletions
diff --git a/src/datacache/datacache.c b/src/datacache/datacache.c index 7c92f7737..324ab78ef 100644 --- a/src/datacache/datacache.c +++ b/src/datacache/datacache.c | |||
@@ -139,7 +139,7 @@ GNUNET_DATACACHE_create (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
139 | char *name; | 139 | char *name; |
140 | 140 | ||
141 | if (GNUNET_OK != | 141 | if (GNUNET_OK != |
142 | GNUNET_CONFIGURATION_get_value_number (cfg, section, "QUOTA", "a)) | 142 | GNUNET_CONFIGURATION_get_value_size (cfg, section, "QUOTA", "a)) |
143 | { | 143 | { |
144 | LOG (GNUNET_ERROR_TYPE_ERROR, | 144 | LOG (GNUNET_ERROR_TYPE_ERROR, |
145 | _("No `%s' specified for `%s' in configuration!\n"), "QUOTA", section); | 145 | _("No `%s' specified for `%s' in configuration!\n"), "QUOTA", section); |
diff --git a/src/datacache/perf_datacache_data_mysql.conf b/src/datacache/perf_datacache_data_mysql.conf index 255006925..1760f7d08 100644 --- a/src/datacache/perf_datacache_data_mysql.conf +++ b/src/datacache/perf_datacache_data_mysql.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [perfcache] | 1 | [perfcache] |
2 | QUOTA = 500000 | 2 | QUOTA = 500 KB |
3 | DATABASE = mysql | 3 | DATABASE = mysql |
4 | 4 | ||
5 | [datacache-mysql] | 5 | [datacache-mysql] |
diff --git a/src/datacache/perf_datacache_data_postgres.conf b/src/datacache/perf_datacache_data_postgres.conf index 9626933a3..c92f52a04 100644 --- a/src/datacache/perf_datacache_data_postgres.conf +++ b/src/datacache/perf_datacache_data_postgres.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [perfcache] | 1 | [perfcache] |
2 | QUOTA = 500000 | 2 | QUOTA = 500 KB |
3 | DATABASE = postgres | 3 | DATABASE = postgres |
4 | 4 | ||
5 | [datacache-postgres] | 5 | [datacache-postgres] |
diff --git a/src/datacache/perf_datacache_data_sqlite.conf b/src/datacache/perf_datacache_data_sqlite.conf index b81034f5f..9d0dbbdba 100644 --- a/src/datacache/perf_datacache_data_sqlite.conf +++ b/src/datacache/perf_datacache_data_sqlite.conf | |||
@@ -1,4 +1,4 @@ | |||
1 | [perfcache] | 1 | [perfcache] |
2 | QUOTA = 500000 | 2 | QUOTA = 500 KB |
3 | DATABASE = sqlite | 3 | DATABASE = sqlite |
4 | 4 | ||
diff --git a/src/datacache/test_datacache_data_mysql.conf b/src/datacache/test_datacache_data_mysql.conf index de84b4ca7..bc9daa3ad 100644 --- a/src/datacache/test_datacache_data_mysql.conf +++ b/src/datacache/test_datacache_data_mysql.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [testcache] | 1 | [testcache] |
2 | QUOTA = 1000000 | 2 | QUOTA = 1 MB |
3 | DATABASE = mysql | 3 | DATABASE = mysql |
4 | 4 | ||
5 | [datacache-mysql] | 5 | [datacache-mysql] |
diff --git a/src/datacache/test_datacache_data_postgres.conf b/src/datacache/test_datacache_data_postgres.conf index 5452ea817..09e8e7253 100644 --- a/src/datacache/test_datacache_data_postgres.conf +++ b/src/datacache/test_datacache_data_postgres.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | 1 | ||
2 | [testcache] | 2 | [testcache] |
3 | QUOTA = 1000000 | 3 | QUOTA = 1 MB |
4 | DATABASE = postgres | 4 | DATABASE = postgres |
5 | 5 | ||
6 | [datacache-postgres] | 6 | [datacache-postgres] |
diff --git a/src/datacache/test_datacache_data_sqlite.conf b/src/datacache/test_datacache_data_sqlite.conf index 8254e483a..bf6ce1b2b 100644 --- a/src/datacache/test_datacache_data_sqlite.conf +++ b/src/datacache/test_datacache_data_sqlite.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | [testcache] | 1 | [testcache] |
2 | QUOTA = 1000000 | 2 | QUOTA = 1 MB |
3 | DATABASE = sqlite | 3 | DATABASE = sqlite |
4 | 4 | ||
5 | 5 | ||
diff --git a/src/datastore/datastore.conf b/src/datastore/datastore.conf index ed44036c7..e86c75bb6 100644 --- a/src/datastore/datastore.conf +++ b/src/datastore/datastore.conf | |||
@@ -10,7 +10,7 @@ CONFIG = $DEFAULTCONFIG | |||
10 | BINARY = gnunet-service-datastore | 10 | BINARY = gnunet-service-datastore |
11 | ACCEPT_FROM = 127.0.0.1; | 11 | ACCEPT_FROM = 127.0.0.1; |
12 | ACCEPT_FROM6 = ::1; | 12 | ACCEPT_FROM6 = ::1; |
13 | QUOTA = 100000000 | 13 | QUOTA = 100 MB |
14 | BLOOMFILTER = $SERVICEHOME/fs/bloomfilter | 14 | BLOOMFILTER = $SERVICEHOME/fs/bloomfilter |
15 | DATABASE = sqlite | 15 | DATABASE = sqlite |
16 | # DISABLE_SOCKET_FORWARDING = NO | 16 | # DISABLE_SOCKET_FORWARDING = NO |
diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c index 71379d5db..be88d288e 100644 --- a/src/datastore/gnunet-service-datastore.c +++ b/src/datastore/gnunet-service-datastore.c | |||
@@ -1480,7 +1480,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
1480 | 1480 | ||
1481 | cfg = c; | 1481 | cfg = c; |
1482 | if (GNUNET_OK != | 1482 | if (GNUNET_OK != |
1483 | GNUNET_CONFIGURATION_get_value_number (cfg, "DATASTORE", "QUOTA", "a)) | 1483 | GNUNET_CONFIGURATION_get_value_size (cfg, "DATASTORE", "QUOTA", "a)) |
1484 | { | 1484 | { |
1485 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1485 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
1486 | _("No `%s' specified for `%s' in configuration!\n"), "QUOTA", | 1486 | _("No `%s' specified for `%s' in configuration!\n"), "QUOTA", |
diff --git a/src/datastore/test_datastore_api_data_mysql.conf b/src/datastore/test_datastore_api_data_mysql.conf index 3dc17c3af..8e5a3dc0d 100644 --- a/src/datastore/test_datastore_api_data_mysql.conf +++ b/src/datastore/test_datastore_api_data_mysql.conf | |||
@@ -17,7 +17,7 @@ PORT = 22667 | |||
17 | PORT = 42464 | 17 | PORT = 42464 |
18 | 18 | ||
19 | [datastore] | 19 | [datastore] |
20 | QUOTA = 10000000 | 20 | QUOTA = 10 MB |
21 | DATABASE = mysql | 21 | DATABASE = mysql |
22 | 22 | ||
23 | [datastore-mysql] | 23 | [datastore-mysql] |
diff --git a/src/datastore/test_datastore_api_data_postgres.conf b/src/datastore/test_datastore_api_data_postgres.conf index c806ab5be..046c561f4 100644 --- a/src/datastore/test_datastore_api_data_postgres.conf +++ b/src/datastore/test_datastore_api_data_postgres.conf | |||
@@ -17,7 +17,7 @@ PORT = 22667 | |||
17 | PORT = 42464 | 17 | PORT = 42464 |
18 | 18 | ||
19 | [datastore] | 19 | [datastore] |
20 | QUOTA = 10000000 | 20 | QUOTA = 10 MB |
21 | DATABASE = postgres | 21 | DATABASE = postgres |
22 | 22 | ||
23 | [datastore-postgres] | 23 | [datastore-postgres] |
diff --git a/src/datastore/test_datastore_api_data_sqlite.conf b/src/datastore/test_datastore_api_data_sqlite.conf index eaf4f2b5c..098f9d2b6 100644 --- a/src/datastore/test_datastore_api_data_sqlite.conf +++ b/src/datastore/test_datastore_api_data_sqlite.conf | |||
@@ -17,7 +17,7 @@ PORT = 22667 | |||
17 | PORT = 42464 | 17 | PORT = 42464 |
18 | 18 | ||
19 | [datastore] | 19 | [datastore] |
20 | QUOTA = 10000000 | 20 | QUOTA = 10 MB |
21 | 21 | ||
22 | [fs] | 22 | [fs] |
23 | AUTOSTART = NO | 23 | AUTOSTART = NO |
diff --git a/src/datastore/test_defaults.conf b/src/datastore/test_defaults.conf index e2911fc2d..bbc1ad190 100644 --- a/src/datastore/test_defaults.conf +++ b/src/datastore/test_defaults.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | [datastore] | 1 | [datastore] |
2 | PORT = 22654 | 2 | PORT = 22654 |
3 | QUOTA = 1000000 | 3 | QUOTA = 1 MB |
4 | 4 | ||
5 | [dht] | 5 | [dht] |
6 | AUTOSTART = NO | 6 | AUTOSTART = NO |
diff --git a/src/dht/dht.conf b/src/dht/dht.conf index 50c25daac..ba903a2d0 100644 --- a/src/dht/dht.conf +++ b/src/dht/dht.conf | |||
@@ -34,5 +34,5 @@ UNIX_MATCH_GID = YES | |||
34 | 34 | ||
35 | [dhtcache] | 35 | [dhtcache] |
36 | DATABASE = sqlite | 36 | DATABASE = sqlite |
37 | QUOTA = 1024000 | 37 | QUOTA = 1 MB |
38 | 38 | ||
diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf index 090a7e507..6bd5a8920 100644 --- a/src/dht/test_dht_api_peer1.conf +++ b/src/dht/test_dht_api_peer1.conf | |||
@@ -17,7 +17,7 @@ BINARY = gnunet-service-dht | |||
17 | plugins = dht test | 17 | plugins = dht test |
18 | 18 | ||
19 | [dhtcache] | 19 | [dhtcache] |
20 | QUOTA = 1000000 | 20 | QUOTA = 1 MB |
21 | DATABASE = sqlite | 21 | DATABASE = sqlite |
22 | 22 | ||
23 | [transport] | 23 | [transport] |
diff --git a/src/dht/test_dht_multipeer_data.conf b/src/dht/test_dht_multipeer_data.conf index 3e5d2c756..9268153d7 100644 --- a/src/dht/test_dht_multipeer_data.conf +++ b/src/dht/test_dht_multipeer_data.conf | |||
@@ -27,7 +27,7 @@ CONVERGE_MODIFIER = 4 | |||
27 | plugins = test dht | 27 | plugins = test dht |
28 | 28 | ||
29 | [dhtcache] | 29 | [dhtcache] |
30 | QUOTA = 1000000 | 30 | QUOTA = 1 MB |
31 | DATABASE = sqlite | 31 | DATABASE = sqlite |
32 | 32 | ||
33 | [transport] | 33 | [transport] |
diff --git a/src/dht/test_dht_twopeer_data.conf b/src/dht/test_dht_twopeer_data.conf index 93cf0fa42..0cb0f18ab 100644 --- a/src/dht/test_dht_twopeer_data.conf +++ b/src/dht/test_dht_twopeer_data.conf | |||
@@ -16,7 +16,7 @@ BINARY = gnunet-service-dht | |||
16 | plugins = test dht dns | 16 | plugins = test dht dns |
17 | 17 | ||
18 | [dhtcache] | 18 | [dhtcache] |
19 | QUOTA = 1000000 | 19 | QUOTA = 1 MB |
20 | DATABASE = sqlite | 20 | DATABASE = sqlite |
21 | 21 | ||
22 | [transport] | 22 | [transport] |
diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf index 6b2f02ee6..957dc6859 100644 --- a/src/fs/fs_test_lib_data.conf +++ b/src/fs/fs_test_lib_data.conf | |||
@@ -7,5 +7,5 @@ TOTAL_QUOTA_IN = 3932160 | |||
7 | TOTAL_QUOTA_OUT = 3932160 | 7 | TOTAL_QUOTA_OUT = 3932160 |
8 | 8 | ||
9 | [datastore] | 9 | [datastore] |
10 | QUOTA = 2000000000 | 10 | QUOTA = 2 GB |
11 | 11 | ||
diff --git a/src/fs/test_fs_defaults.conf b/src/fs/test_fs_defaults.conf index f71a12061..a2b111181 100644 --- a/src/fs/test_fs_defaults.conf +++ b/src/fs/test_fs_defaults.conf | |||
@@ -28,7 +28,7 @@ HOSTNAME = localhost | |||
28 | DEFAULTSERVICES = fs | 28 | DEFAULTSERVICES = fs |
29 | 29 | ||
30 | [datastore] | 30 | [datastore] |
31 | QUOTA = 100000000 | 31 | QUOTA = 100 MB |
32 | 32 | ||
33 | [statistics] | 33 | [statistics] |
34 | PORT = 43467 | 34 | PORT = 43467 |
diff --git a/src/mesh/test_mesh.conf b/src/mesh/test_mesh.conf index c6a6dff2e..b619591b8 100644 --- a/src/mesh/test_mesh.conf +++ b/src/mesh/test_mesh.conf | |||
@@ -25,7 +25,7 @@ PORT = 2100 | |||
25 | plugins = dht test | 25 | plugins = dht test |
26 | 26 | ||
27 | [dhtcache] | 27 | [dhtcache] |
28 | QUOTA = 1000000 | 28 | QUOTA = 1 MB |
29 | DATABASE = sqlite | 29 | DATABASE = sqlite |
30 | 30 | ||
31 | [transport] | 31 | [transport] |
diff --git a/src/mesh/test_mesh_path.conf b/src/mesh/test_mesh_path.conf index c6a6dff2e..b619591b8 100644 --- a/src/mesh/test_mesh_path.conf +++ b/src/mesh/test_mesh_path.conf | |||
@@ -25,7 +25,7 @@ PORT = 2100 | |||
25 | plugins = dht test | 25 | plugins = dht test |
26 | 26 | ||
27 | [dhtcache] | 27 | [dhtcache] |
28 | QUOTA = 1000000 | 28 | QUOTA = 1 MB |
29 | DATABASE = sqlite | 29 | DATABASE = sqlite |
30 | 30 | ||
31 | [transport] | 31 | [transport] |
diff --git a/src/vpn/test-conf.conf b/src/vpn/test-conf.conf index 39446b53c..2b6186b2d 100644 --- a/src/vpn/test-conf.conf +++ b/src/vpn/test-conf.conf | |||
@@ -49,7 +49,7 @@ UNIXPATH = /tmp/gnunet-service-dht.sock | |||
49 | # PREFIX = | 49 | # PREFIX = |
50 | 50 | ||
51 | [dhtcache] | 51 | [dhtcache] |
52 | QUOTA = 1000000 | 52 | QUOTA = 1 MB |
53 | DATABASE = sqlite | 53 | DATABASE = sqlite |
54 | 54 | ||
55 | [arm] | 55 | [arm] |
@@ -217,7 +217,7 @@ CONFIG = $DEFAULTCONFIG | |||
217 | BINARY = gnunet-service-datastore | 217 | BINARY = gnunet-service-datastore |
218 | ACCEPT_FROM = 127.0.0.1; | 218 | ACCEPT_FROM = 127.0.0.1; |
219 | ACCEPT_FROM6 = ::1; | 219 | ACCEPT_FROM6 = ::1; |
220 | QUOTA = 100000000 | 220 | QUOTA = 100 MB |
221 | BLOOMFILTER = $SERVICEHOME/fs/bloomfilter | 221 | BLOOMFILTER = $SERVICEHOME/fs/bloomfilter |
222 | DATABASE = sqlite | 222 | DATABASE = sqlite |
223 | 223 | ||