empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get rid of RET_SYS, just use RET_FAIL

Browse source 
RET_SYS was used for commands failing due to internal or environmental
errors, but not really systematically.  The difference to RET_FAIL is
how dispatch() treats them: RET_SYS got logged, and cost no BTUs.

More specific logging is possible at the point of failure than in
dispatch().  Make sure that's done for all failures that used to
return RET_SYS.

The change in BTU charging affects commands consider, offer, repay,
trade failing due to internal errors.  It also affects deity commands
reload and turn (irrelevant because deities get unlimited BTUs), and
commands apropos, info and motd (irrelevant because they cost no
BTUs).
This commit is contained in:
Markus Armbruster 2008-08-03 11:34:00 -04:00
parent e803950463
commit 29aefc356f
10 changed files with 42 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/lib/commands/cons.c
View file

@ -196,8 +196,9 @@ loan_accept(struct ltcomstr *ltcp)
return RET_OK;
}
if (!getloan(ltcp->num, lp)) {
pr("loan_accept: can't read loan; get help!\n");
return RET_SYS;
logerror("loan_accept: can't read loan");
pr("can't read loan; get help!\n");
return RET_FAIL;
}
if (lp->l_status == LS_FREE) { /* other guy retratcted already */
late(ltcp);
@ -250,8 +251,9 @@ loan_decline(struct ltcomstr *ltcp)
lp = &ltcp->u.l;
if (!getloan(ltcp->num, lp)) {
pr("Decline: can't read loan; get help!\n");
return RET_SYS;
logerror("loan_decline: can't read loan");
pr("can't read loan; get help!\n");
return RET_FAIL;
}
/* loan got accepted somehow between now and last time we checked */
if (lp->l_status == LS_SIGNED) {
@ -260,8 +262,9 @@ loan_decline(struct ltcomstr *ltcp)
}
lp->l_status = LS_FREE;
if (!putloan(ltcp->num, lp)) {
pr("loan_decline: can't write loan; get help!\n");
return RET_SYS;
logerror("loan_decline: can't write loan");
pr("can't write loan; get help!\n");
return RET_FAIL;
}
decline(ltcp);
return RET_OK;
@ -281,8 +284,9 @@ treaty_accept(struct ltcomstr *ltcp)
return RET_OK;
}
if (!gettre(ltcp->num, tp)) {
pr("Accept: can't read treaty; get help!\n");
return RET_SYS;
pr("treaty_accept: can't read treaty");
pr("can't read treaty; get help!\n");
return RET_FAIL;
}
if (tp->trt_status == TS_FREE) { /* treaty offer withdrawn */
late(ltcp);
@ -294,8 +298,9 @@ treaty_accept(struct ltcomstr *ltcp)
}
tp->trt_status = TS_SIGNED;
if (!puttre(ltcp->num, tp)) {
pr("treaty_accept: can't write treaty");
pr("Problem saving treaty; get help!\n");
return RET_SYS;
return RET_FAIL;
}
accpt(ltcp);
pr("Treaty in effect until %s", ctime(&tp->trt_exp));
@ -312,8 +317,9 @@ treaty_decline(struct ltcomstr *ltcp)
tp = &ltcp->u.t;
if (!gettre(ltcp->num, tp)) {
pr("Decline: can't read treaty; get help!\n");
return RET_SYS;
logerror("treaty_decline: can't read treaty");
pr("can't read treaty; get help!\n");
return RET_FAIL;
}
/* treaty got signed somehow between now and last time we read it */
if (tp->trt_status == TS_SIGNED) {
@ -322,8 +328,9 @@ treaty_decline(struct ltcomstr *ltcp)
}
tp->trt_status = TS_FREE;
if (!puttre(ltcp->num, tp)) {
logerror("treaty_decline: can't write treaty");
pr("Problem saving treaty; get help!\n");
return RET_SYS;
return RET_FAIL;
}
decline(ltcp);
return RET_OK;