[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] clean up some confusing logs.
Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or
Modified Files:
config.c or.h
Log Message:
clean up some confusing logs.
make MonthlyAccountingStart truly obsolete now.
Index: config.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/config.c,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -d -r1.387 -r1.388
--- config.c 15 Aug 2005 08:51:20 -0000 1.387
+++ config.c 15 Aug 2005 09:17:47 -0000 1.388
@@ -146,7 +146,7 @@
VAR("MaxAdvertisedBandwidth",MEMUNIT,MaxAdvertisedBandwidth,"128 TB"),
VAR("MaxCircuitDirtiness", INTERVAL, MaxCircuitDirtiness, "10 minutes"),
VAR("MaxOnionsPending", UINT, MaxOnionsPending, "100"),
- VAR("MonthlyAccountingStart",UINT, _MonthlyAccountingStart,"0"),
+ OBSOLETE("MonthlyAccountingStart"),
VAR("MyFamily", STRING, MyFamily, NULL),
VAR("NewCircuitPeriod", INTERVAL, NewCircuitPeriod, "30 seconds"),
VAR("Nickname", STRING, Nickname, NULL),
@@ -1743,19 +1743,19 @@
}
if (options->DirFetchPeriod > MAX_DIR_PERIOD) {
- log(LOG_WARN, "DirFetchPeriod is too large; clipping.");
+ log(LOG_WARN, "DirFetchPeriod is too large; clipping to %ds.", MAX_DIR_PERIOD);
options->DirFetchPeriod = MAX_DIR_PERIOD;
}
if (options->DirPostPeriod > MAX_DIR_PERIOD) {
- log(LOG_WARN, "DirPostPeriod is too large; clipping.");
+ log(LOG_WARN, "DirPostPeriod is too large; clipping to %ds.", MAX_DIR_PERIOD);
options->DirPostPeriod = MAX_DIR_PERIOD;
}
if (options->StatusFetchPeriod > MAX_DIR_PERIOD) {
- log(LOG_WARN, "StatusFetchPeriod is too large; clipping.");
+ log(LOG_WARN, "StatusFetchPeriod is too large; clipping to %ds.", MAX_DIR_PERIOD);
options->StatusFetchPeriod = MAX_DIR_PERIOD;
}
if (options->RendPostPeriod > MAX_DIR_PERIOD) {
- log(LOG_WARN, "RendPostPeriod is too large; clipping.");
+ log(LOG_WARN, "RendPostPeriod is too large; clipping to %ds.", MAX_DIR_PERIOD);
options->RendPostPeriod = MAX_DIR_PERIOD;
}
@@ -1782,6 +1782,7 @@
result = -1;
}
+#if 0
if (options->_MonthlyAccountingStart) {
if (options->AccountingStart) {
log(LOG_WARN,"Can't specify AccountingStart and MonthlyAccountingStart");
@@ -1797,6 +1798,7 @@
}
}
}
+#endif
if (accounting_parse_options(options, 1)<0) {
result = -1;
Index: or.h
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/or.h,v
retrieving revision 1.645
retrieving revision 1.646
diff -u -d -r1.645 -r1.646
--- or.h 15 Aug 2005 03:35:15 -0000 1.645
+++ or.h 15 Aug 2005 09:17:47 -0000 1.646
@@ -1151,8 +1151,6 @@
config_line_t *RedirectExit; /**< List of config lines for simple
* addr/port redirection */
smartlist_t *RedirectExitList; /**< List of exit_redirect_t */
- int _MonthlyAccountingStart; /**< Deprecated: day of month when accounting
- * interval starts */
char *AccountingStart; /**< How long is the accounting interval, and when
* does it start? */
uint64_t AccountingMax; /**< How many bytes do we allow per accounting