Browse Source

Onboarding: Make log output texts friendlier to new users

ppa-0.6.1
practicalswift 7 years ago
committed by Rusty Russell
parent
commit
689db5b7c1
  1. 2
      common/version.h
  2. 2
      lightningd/lightningd.c
  3. 2
      lightningd/options.c
  4. 6
      lightningd/peer_control.c
  5. 2
      tests/utils.py

2
common/version.h

@ -8,6 +8,6 @@ const char *version(void);
#define opt_register_version() \ #define opt_register_version() \
opt_register_early_noarg("--version|-V", version_and_exit, NULL, \ opt_register_early_noarg("--version|-V", version_and_exit, NULL, \
"print version to standard output and exit") "Print version and exit")
#endif /* LIGHTNING_COMMON_VERSION_H */ #endif /* LIGHTNING_COMMON_VERSION_H */

2
lightningd/lightningd.c

@ -332,7 +332,7 @@ int main(int argc, char *argv[])
setup_jsonrpc(ld, ld->rpc_filename); setup_jsonrpc(ld, ld->rpc_filename);
/* Mark ourselves live. */ /* Mark ourselves live. */
log_info(ld->log, "Hello world from %s aka %s #%s (version %s)!", log_info(ld->log, "Server started with public key %s, alias %s (color #%s) and lightningd %s",
type_to_string(ltmp, struct pubkey, &ld->id), type_to_string(ltmp, struct pubkey, &ld->id),
ld->alias, tal_hex(ltmp, ld->rgb), version()); ld->alias, tal_hex(ltmp, ld->rgb), version());

2
lightningd/options.c

@ -617,7 +617,7 @@ bool handle_opts(struct lightningd *ld, int argc, char *argv[])
/* Move to config dir, to save ourselves the hassle of path manip. */ /* Move to config dir, to save ourselves the hassle of path manip. */
if (chdir(ld->config_dir) != 0) { if (chdir(ld->config_dir) != 0) {
log_unusual(ld->log, "Creating lightningd dir %s", log_unusual(ld->log, "Creating configuration directory %s",
ld->config_dir); ld->config_dir);
if (mkdir(ld->config_dir, 0700) != 0) if (mkdir(ld->config_dir, 0700) != 0)
fatal("Could not make directory %s: %s", fatal("Could not make directory %s: %s",

6
lightningd/peer_control.c

@ -280,7 +280,7 @@ void peer_fail_transient(struct peer *peer, const char *fmt, ...)
void peer_set_condition(struct peer *peer, enum peer_state old_state, void peer_set_condition(struct peer *peer, enum peer_state old_state,
enum peer_state state) enum peer_state state)
{ {
log_info(peer->log, "state: %s -> %s", log_info(peer->log, "State changed from %s to %s",
peer_state_name(peer->state), peer_state_name(state)); peer_state_name(peer->state), peer_state_name(state));
if (peer->state != old_state) if (peer->state != old_state)
fatal("peer state %s should be %s", fatal("peer state %s should be %s",
@ -668,9 +668,9 @@ static void copy_to_parent_log(const char *prefix,
{ {
const char *idstr = type_to_string(peer, struct pubkey, &peer->id); const char *idstr = type_to_string(peer, struct pubkey, &peer->id);
if (continued) if (continued)
log_add(peer->ld->log, "peer %s: ... %s", idstr, str); log_add(peer->ld->log, "Peer %s: ... %s", idstr, str);
else else
log_(peer->ld->log, level, "peer %s: %s", idstr, str); log_(peer->ld->log, level, "Peer %s: %s", idstr, str);
tal_free(idstr); tal_free(idstr);
} }

2
tests/utils.py

@ -266,7 +266,7 @@ class LightningD(TailableProc):
def start(self): def start(self):
TailableProc.start(self) TailableProc.start(self)
self.wait_for_log("Hello world from") self.wait_for_log("Server started with public key")
logging.info("LightningD started") logging.info("LightningD started")
def wait(self, timeout=10): def wait(self, timeout=10):

Loading…
Cancel
Save