Navigation Menu

Skip to content

Commit

Permalink
Print direct command line responses to standard output instead of usi…
Browse files Browse the repository at this point in the history 
…ng the log system

Using logging for these just makes them bloated and hard to read and overally just not neat at all.
  • Loading branch information
@celeron55
celeron55 committed Nov 1, 2015
1 parent 52e5b51 commit 3285bf7
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions src/main.cpp
View file
Expand Up @@ -300,7 +300,7 @@ static void set_allowed_options(OptionList *allowed_options)

static void print_help(const OptionList &allowed_options)
{
dstream << _("Allowed options:") << std::endl;
std::cout << _("Allowed options:") << std::endl;
print_allowed_options(allowed_options);
}

Expand All @@ -313,37 +313,37 @@ static void print_allowed_options(const OptionList &allowed_options)
if (i->second.type != VALUETYPE_FLAG)
os1 << _(" <value>");

dstream << padStringRight(os1.str(), 24);
std::cout << padStringRight(os1.str(), 24);

if (i->second.help != NULL)
dstream << i->second.help;
std::cout << i->second.help;

dstream << std::endl;
std::cout << std::endl;
}
}

static void print_version()
{
dstream << PROJECT_NAME_C " " << g_version_hash << std::endl;
std::cout << PROJECT_NAME_C " " << g_version_hash << std::endl;
#ifndef SERVER
dstream << "Using Irrlicht " << IRRLICHT_SDK_VERSION << std::endl;
std::cout << "Using Irrlicht " << IRRLICHT_SDK_VERSION << std::endl;
#endif
dstream << "Build info: " << g_build_info << std::endl;
std::cout << "Build info: " << g_build_info << std::endl;
}

static void list_game_ids()
{
std::set<std::string> gameids = getAvailableGameIds();
for (std::set<std::string>::const_iterator i = gameids.begin();
i != gameids.end(); ++i)
dstream << (*i) <<std::endl;
std::cout << (*i) <<std::endl;
}

static void list_worlds()
{
dstream << _("Available worlds:") << std::endl;
std::cout << _("Available worlds:") << std::endl;
std::vector<WorldSpec> worldspecs = getAvailableWorlds();
print_worldspecs(worldspecs, dstream);
print_worldspecs(worldspecs, std::cout);
}

static void print_worldspecs(const std::vector<WorldSpec> &worldspecs,
Expand Down

2 comments on commit 3285bf7

@gaelysam
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When using print() in Lua, the successive lines are written without line break, causing huge lines and unreadable logs:

[Valleys Mapgen] Generating map from (48,48,288) to (127,127,367) ...2015-11-07 19:12:54: WARNING[Emerge-0]: Undeclared global variable "darkage_mapgen" accessed at /home/gael/.minetest/mods/valleys_mapgen/mapgen.lua:540
[Valleys Mapgen] Mapgen finished in 409.377 ms[Valleys Mapgen] Generating map from (48,-32,288) to (127,47,367) ...[Valleys Mapgen] Mapgen finished in 462.871 ms[Valleys Mapgen] Generating map from (-32,48,288) to (47,127,367) ...[Valleys Mapgen] Mapgen finished in 491.281 ms[Valleys Mapgen] Generating map from (48,48,368) to (127,127,447) ...[Valleys Mapgen] Mapgen finished in 444.202 ms[Valleys Mapgen] Generating map from (-32,48,368) to (47,127,447) ...[Valleys Mapgen] Mapgen finished in 494.587 ms[Valleys Mapgen] Generating map from (48,-32,368) to (127,47,447) ...[Valleys Mapgen] Mapgen finished in 512.253 ms[Valleys Mapgen] Generating map from (-32,-32,368) to (47,47,447) ...[Valleys Mapgen] Mapgen finished in 493.097 ms[Valleys Mapgen] Generating map from (128,48,368) to (207,127,447) ...[Valleys Mapgen] Mapgen finished in 540.268 ms[Valleys Mapgen] Generating map from (-32,-32,288) to (47,47,367) ...[Valleys Mapgen] Mapgen finished in 587.809 ms[Valleys Mapgen] Generating map from (-32,128,368) to (47,207,447) ...[Valleys Mapgen] Mapgen finished in 456.398 ms[Valleys Mapgen] Generating map from (48,128,368) to (127,207,447) ...[Valleys Mapgen] Mapgen finished in 520.919 ms[Valleys Mapgen] Generating map from (128,-32,368) to (207,47,447) ...[Valleys Mapgen] Mapgen finished in 619.864 ms2015-11-07 19:13:12: WARNING[Main]: Map::getNodeMetadata(): Block not found
[Valleys Mapgen] Generating map from (48,48,448) to (127,127,527) ...[Valleys Mapgen] Mapgen finished in 623.309 ms[Valleys Mapgen] Generating map from (128,128,448) to (207,207,527) ...[Valleys Mapgen] Mapgen finished in 532.554 ms2015-11-07 19:13:20: WARNING[Main]: Map::getNodeMetadata(): Block not found
2015-11-07 19:13:20: WARNING[Main]: Map::getNodeMetadata(): Block not found
2015-11-07 19:13:24: WARNING[Main]: Map::getNodeMetadata(): Block not found
2015-11-07 19:13:25: ACTION[Server]: singleplayer granted (server, shout, fly, password, bring, kick, teleport, ban, noclip, privs, fast, basic_privs, rollback, home, interact, settime, give) privileges to singleplayer
[Valleys Mapgen] Generating map from (128,128,368) to (207,207,447) ...[Valleys Mapgen] Mapgen finished in 475.452 ms[Valleys Mapgen] Generating map from (128,48,448) to (207,127,527) ...[Valleys Mapgen] Mapgen finished in 619.202 ms[Valleys Mapgen] Generating map from (-32,48,448) to (47,127,527) ...[Valleys Mapgen] Mapgen finished in 691.296 ms[Valleys Mapgen] Generating map from (-32,128,448) to (47,207,527) ...[Valleys Mapgen] Mapgen finished in 553.756 ms[Valleys Mapgen] Generating map from (-32,-32,448) to (47,47,527) ...[Valleys Mapgen] Mapgen finished in 609.926 ms[Valleys Mapgen] Generating map from (128,-32,448) to (207,47,527) ...[Valleys Mapgen] Mapgen finished in 614.119 ms[Valleys Mapgen] Generating map from (48,128,448) to (127,207,527) ...[Valleys Mapgen] Mapgen finished in 459.099 ms[Valleys Mapgen] Generating map from (48,-32,448) to (127,47,527) ...[Valleys Mapgen] Mapgen finished in 543.228 ms[Valleys Mapgen] Generating map from (208,48,448) to (287,127,527) ...[Valleys Mapgen] Mapgen finished in 499.204 ms[Valleys Mapgen] Generating map from (208,48,528) to (287,127,607) ...[Valleys Mapgen] Mapgen finished in 549.488 ms[Valleys Mapgen] Generating map from (48,48,528) to (127,127,607) ...[Valleys Mapgen] Mapgen finished in 590.557 ms[Valleys Mapgen] Generating map from (128,48,528) to (207,127,607) ...[Valleys Mapgen] Mapgen finished in 580.632 ms[Valleys Mapgen] Generating map from (208,128,448) to (287,207,527) ...[Valleys Mapgen] Mapgen finished in 448.621 ms[Valleys Mapgen] Generating map from (208,128,528) to (287,207,607) ...[Valleys Mapgen] Mapgen finished in 491.066 ms[Valleys Mapgen] Generating map from (48,128,528) to (127,207,607) ...[Valleys Mapgen] Mapgen finished in 677.488 ms[Valleys Mapgen] Generating map from (128,48,288) to (207,127,367) ...[Valleys Mapgen] Mapgen finished in 634.274 ms[Valleys Mapgen] Generating map from (128,-32,288) to (207,47,367) ...[Valleys Mapgen] Mapgen finished in 698.136 ms[Valleys Mapgen] Generating map from (128,128,528) to (207,207,607) ...[Valleys Mapgen] Mapgen finished in 555.45 ms[Valleys Mapgen] Generating map from (208,48,368) to (287,127,447) ...[Valleys Mapgen] Mapgen finished in 544.36 ms[Valleys Mapgen] Generating map from (48,48,608) to (127,127,687) ...[Valleys Mapgen] Mapgen finished in 916.916 ms[Valleys Mapgen] Generating map from (128,48,608) to (207,127,687) ...[Valleys Mapgen] Mapgen finished in 794.86 ms[Valleys Mapgen] Generating map from (48,128,608) to (127,207,687) ...[Valleys Mapgen] Mapgen finished in 517.248 ms[Valleys Mapgen] Generating map from (128,128,608) to (207,207,687) ...[Valleys Mapgen] Mapgen finished in 558.51 ms[Valleys Mapgen] Generating map from (208,48,608) to (287,127,687) ...[Valleys Mapgen] Mapgen finished in 888.886 ms[Valleys Mapgen] Generating map from (48,208,608) to (127,287,687) ...[Valleys Mapgen] Mapgen finished in 650.819 ms[Valleys Mapgen] Generating map from (128,208,608) to (207,287,687) ...[Valleys Mapgen] Mapgen finished in 642.822 ms[Valleys Mapgen] Generating map from (208,128,608) to (287,207,687) ...[Valleys Mapgen] Mapgen finished in 729.783 ms[Valleys Mapgen] Generating map from (-32,128,608) to (47,207,687) ...[Valleys Mapgen] Mapgen finished in 725.251 ms[Valleys Mapgen] Generating map from (-32,48,608) to (47,127,687) ...[Valleys Mapgen] Mapgen finished in 937.893 ms[Valleys Mapgen] Generating map from (48,48,688) to (127,127,767) ...[Valleys Mapgen] Mapgen finished in 817.283 ms[Valleys Mapgen] Generating map from (128,48,688) to (207,127,767) ...[Valleys Mapgen] Mapgen finished in 728.616 ms[Valleys Mapgen] Generating map from (128,128,688) to (207,207,767) ...[Valleys Mapgen] Mapgen finished in 468.192 ms[Valleys Mapgen] Generating map from (48,128,688) to (127,207,767) ...[Valleys Mapgen] Mapgen finished in 477.939 ms[Valleys Mapgen] Generating map from (208,48,688) to (287,127,767) ...[Valleys Mapgen] Mapgen finished in 516.101 ms[Valleys Mapgen] Generating map from (208,48,768) to (287,127,847) ...[Valleys Mapgen] Mapgen finished in 409.87 ms[Valleys Mapgen] Generating map from (208,128,688) to (287,207,767) ...[Valleys Mapgen] Mapgen finished in 442.376 ms[Valleys Mapgen] Generating map from (208,128,768) to (287,207,847) ...[Valleys Mapgen] Mapgen finished in 396.615 ms[Valleys Mapgen] Generating map from (48,48,768) to (127,127,847) ...[Valleys Mapgen] Mapgen finished in 497.721 ms[Valleys Mapgen] Generating map from (128,48,768) to (207,127,847) ...[Valleys Mapgen] Mapgen finished in 470.015 ms[Valleys Mapgen] Generating map from (48,-32,688) to (127,47,767) ...[Valleys Mapgen] Mapgen finished in 469.015 ms[Valleys Mapgen] Generating map from (48,-32,768) to (127,47,847) ...[Valleys Mapgen] Mapgen finished in 530.054 ms[Valleys Mapgen] Generating map from (128,-32,688) to (207,47,767) ...[Valleys Mapgen] Mapgen finished in 543.325 ms[Valleys Mapgen] Generating map from (128,-32,768) to (207,47,847) ...[Valleys Mapgen] Mapgen finished in 601.798 ms[Valleys Mapgen] Generating map from (48,48,848) to (127,127,927) ...[Valleys Mapgen] Mapgen finished in 541.405 ms[Valleys Mapgen] Generating map from (128,48,848) to (207,127,927) ...[Valleys Mapgen] Mapgen finished in 473.328 ms[Valleys Mapgen] Generating map from (208,48,848) to (287,127,927) ...[Valleys Mapgen] Mapgen finished in 440.91 ms[Valleys Mapgen] Generating map from (208,-32,768) to (287,47,847) ...[Valleys Mapgen] Mapgen finished in 614.547 ms[Valleys Mapgen] Generating map from (208,-32,848) to (287,47,927) ...[Valleys Mapgen] Mapgen finished in 568.042 ms[Valleys Mapgen] Generating map from (48,-32,848) to (127,47,927) ...[Valleys Mapgen] Mapgen finished in 503.091 ms[Valleys Mapgen] Generating map from (128,-32,848) to (207,47,927) ...[Valleys Mapgen] Mapgen finished in 593.318 ms[Valleys Mapgen] Generating map from (48,-32,928) to (127,47,1007) ...[Valleys Mapgen] Mapgen finished in 575.39 ms[Valleys Mapgen] Generating map from (128,-32,928) to (207,47,1007) ...[Valleys Mapgen] Mapgen finished in 651.073 ms[Valleys Mapgen] Generating map from (208,-32,928) to (287,47,1007) ...[Valleys Mapgen] Mapgen finished in 614.746 ms[Valleys Mapgen] Generating map from (48,48,928) to (127,127,1007) ...[Valleys Mapgen] Mapgen finished in 630.95 ms[Valleys Mapgen] Generating map from (128,48,928) to (207,127,1007) ...[Valleys Mapgen] Mapgen finished in 569.941 ms[Valleys Mapgen] Generating map from (48,-112,768) to (127,-33,847) ...[Valleys Mapgen] Mapgen finished in 856.848 ms[Valleys Mapgen] Generating map from (48,-112,848) to (127,-33,927) ...[Valleys Mapgen] Mapgen finished in 748.155 ms[Valleys Mapgen] Generating map from (128,-112,768) to (207,-33,847) ...[Valleys Mapgen] Mapgen finished in 657.019 ms[Valleys Mapgen] Generating map from (-32,48,848) to (47,127,927) ...[Valleys Mapgen] Mapgen finished in 677.821 ms[Valleys Mapgen] Generating map from (-32,48,928) to (47,127,1007) ...[Valleys Mapgen] Mapgen finished in 547.947 ms[Valleys Mapgen] Generating map from (48,48,1008) to (127,127,1087) ...[Valleys Mapgen] Mapgen finished in 747.25 ms[Valleys Mapgen] Generating map from (-32,48,1008) to (47,127,1087) ...[Valleys Mapgen] Mapgen fAL lib: FreeContext: (0x1dcaeb0) Deleting 2 Source(s)
inished in 616.267 ms[Valleys Mapgen] Generating map from (-32,-32,848) to (47,47,927) ...[Valleys Mapgen] Mapgen finished in 529.892 ms[Valleys Mapgen] Generating map from (-32,-32,928) to (47,47,1007) ...[Valleys Mapgen] Mapgen finished in 539.415 ms[Valleys Mapgen] Generating map from (-32,-32,1008) to (47,47,1087) ...[Valleys Mapgen] Mapgen finished in 425.698 ms[Valleys Mapgen] Generating map from (128,48,1008) to (207,127,1087) ...[Valleys Mapgen] Mapgen finished in 490.389 ms[Valleys Mapgen] Generating map from (208,48,928) to (287,127,1007) ...[Valleys Mapgen] Mapgen finished in 452.668 ms[Valleys Mapgen] Generating map from (208,48,1008) to (287,127,1087) ...[Valleys Mapgen] Mapgen finished in 470.34 ms[Valleys Mapgen] Generating map from (208,-32,1008) to (287,47,1087) ...[Valleys Mapgen] Mapgen finished in 609.185 ms[Valleys Mapgen] Generating map from (128,-32,1008) to (207,47,1087) ...[Valleys Mapgen] Mapgen finished in 609.216 ms[Valleys Mapgen] Mapgen statistics:[Valleys Mapgen] TOTAL:                               average 577.511 ms                    standard deviation 116.831 ms

@ShadowNinja
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Gael-de-Sailly: I can't reproduce this. Also, it doesn't seem to be related to this commit.

Please sign in to comment.