Merge pull request #7 from azerothcore/master

Merge

src/server/apps/authserver/Main.cpp

@@ -29,6 +29,7 @@
 #include "Config.h"
 #include "DatabaseEnv.h"
 #include "DatabaseLoader.h"
+#include "GitRevision.h"
 #include "IPLocation.h"
 #include "IoContext.h"
 #include "Log.h"
@@ -75,7 +76,7 @@ int main(int argc, char** argv)
     auto vm = GetConsoleArguments(argc, argv, configFile);
 
     // exit if help or version is enabled
-    if (vm.count("help"))
+    if (vm.count("help") || vm.count("version"))
         return 0;
 
     // Add file and args in config
@@ -292,13 +293,11 @@ variables_map GetConsoleArguments(int argc, char** argv, fs::path& configFile)
     }
 
     if (variablesMap.count("help"))
-    {
         std::cout << all << "\n";
-    }
+    else if (variablesMap.count("version"))
+        std::cout << GitRevision::GetFullVersion() << "\n";
     else if (variablesMap.count("dry-run"))
-    {
         sConfigMgr->setDryRun(true);
-    }
 
     return variablesMap;
 }

src/server/apps/worldserver/Main.cpp

@@ -127,7 +127,7 @@ int main(int argc, char** argv)
     auto vm = GetConsoleArguments(argc, argv, configFile, configService);
 
     // exit if help or version is enabled
-    if (vm.count("help"))
+    if (vm.count("help") || vm.count("version"))
         return 0;
 
 #if AC_PLATFORM == AC_PLATFORM_WINDOWS
@@ -744,13 +744,11 @@ variables_map GetConsoleArguments(int argc, char** argv, fs::path& configFile, [
     }
 
     if (vm.count("help"))
-    {
         std::cout << all << "\n";
-    }
+    else if (vm.count("version"))
+        std::cout << GitRevision::GetFullVersion() << "\n";
     else if (vm.count("dry-run"))
-    {
         sConfigMgr->setDryRun(true);
-    }
 
     return vm;
 }

src/server/apps/worldserver/worldserver.conf.dist

@@ -657,7 +657,7 @@ Appender.Console=1,4,0,"1 9 3 6 5 8"
 Appender.Server=2,5,0,Server.log,w
 Appender.Playerbots=2,5,0,Playerbots.log,w
 # Appender.GM=2,5,15,gm_%s.log
-Appender.Errors=2,5,0,Errors.log,w
+Appender.Errors=2,2,0,Errors.log,w
 # Appender.DB=3,5,0
 
 #  Logger config values: Given a logger "name"
@@ -686,6 +686,7 @@ Logger.mmaps=4,Server
 Logger.scripts.hotswap=4,Console Server
 Logger.server=4,Console Server
 Logger.sql.sql=2,Console Errors
+Logger.sql.updates=4,Console Server Errors
 Logger.sql=4,Console Server
 Logger.time.update=4,Console Server
 Logger.module=4,Console Server
@@ -785,7 +786,6 @@ Logger.playerbots=5,Console Playerbots
 #Logger.spells=4,Console Server
 #Logger.sql.dev=4,Console Server
 #Logger.sql.driver=4,Console Server
-#Logger.sql.updates=4,Console Server
 #Logger.vehicles=4,Console Server
 #Logger.warden=4,Console Server
 #Logger.weather=4,Console Server
@@ -3143,6 +3143,16 @@ LeaveGroupOnLogout.Enabled = 0
 
 Group.Raid.LevelRestriction = 10
 
+#
+#    Group.RandomRollMaximum
+#
+#     The maximum value for use with the client '/roll' command.
+#     Blizzlike and maximum value is 1000000. (Based on Classic and 3.3.5a client testing respectively)
+#        Default: 1000000
+#
+
+Group.RandomRollMaximum = 1000000
+
 #
 ###################################################################################################