socketengine_epoll: use getrlimit not ulimit

[user/henk/code/inspircd.git] / src / commands / cmd_reloadmodule.cpp

diff --git a/src/commands/cmd_reloadmodule.cpp b/src/commands/cmd_reloadmodule.cpp
index ca972fd18875bab4f93d112fcead4982ce974ddd..eac364f0e6487ae64e520437a2988c211d5efc86 100644 (file)
--- a/src/commands/cmd_reloadmodule.cpp
+++ b/src/commands/cmd_reloadmodule.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 class CommandReloadmodule : public Command
@@ -43,6 +50,7 @@ class ReloadModuleWorker : public HandlerBase1<void, bool>
                if (user)
                        user->WriteNumeric(975, "%s %s :Module %ssuccessfully reloaded.",
                                user->nick.c_str(), name.c_str(), result ? "" : "un");
+               ServerInstance->GlobalCulls.AddItem(this);
        }
 };
 
@@ -58,7 +66,7 @@ CmdResult CommandReloadmodule::Handle (const std::vector<std::string>& parameter
        Module* m = ServerInstance->Modules->Find(parameters[0]);
        if (m)
        {
-               ServerInstance->Modules->Reload(m, new ReloadModuleWorker(parameters[0], user->uuid));
+               ServerInstance->Modules->Reload(m, (creator->dying ? NULL : new ReloadModuleWorker(user->uuid, parameters[0])));
                return CMD_SUCCESS;
        }
        else