From fb7bc0db702d55dbc38759073a9607d30c33b02b Mon Sep 17 00:00:00 2001 From: JAJames Date: Fri, 17 Jun 2016 19:35:50 -0400 Subject: [PATCH] Updated Jupiter; each plugin config is now rehashed with the plugin Added a few missing 'override' specifiers for explicitness and consistency --- ChannelRelay/ChannelRelay.cpp | 2 ++ Jupiter | 2 +- Release/Bot.lib | Bin 24762 -> 24762 bytes Release/Plugins/RenX.Core.lib | Bin 205782 -> 205782 bytes RenX.Announcements/RenX_Announcements.cpp | 2 ++ RenX.Announcements/RenX_Announcements.h | 2 +- RenX.Commands/RenX_Commands.cpp | 1 + RenX.Core/RenX_Server.h | 2 +- .../ExcessiveHeadshots.cpp | 1 + RenX.ExtraLogging/RenX_ExtraLogging.cpp | 3 +++ RenX.Greetings/RenX_Greetings.cpp | 2 ++ RenX.IRCJoin/RenX_IRCJoin.cpp | 2 ++ RenX.Ladder.Web/RenX_Ladder_Web.cpp | 9 +++++++-- RenX.Ladder.Web/RenX_Ladder_Web.h | 2 ++ RenX.Listen/RenX_Listen.cpp | 2 ++ RenX.Logging/RenX_Logging.cpp | 1 + RenX.Medals/RenX_Medals.cpp | 2 ++ RenX.ModSystem/RenX_ModSystem.cpp | 2 ++ RenX.ModSystem/RenX_ModSystem.h | 2 +- RenX.Warn/RenX_Warn.cpp | 1 + 20 files changed, 34 insertions(+), 6 deletions(-) diff --git a/ChannelRelay/ChannelRelay.cpp b/ChannelRelay/ChannelRelay.cpp index dda4f09..8420554 100644 --- a/ChannelRelay/ChannelRelay.cpp +++ b/ChannelRelay/ChannelRelay.cpp @@ -40,6 +40,8 @@ bool ChannelRelayPlugin::initialize() int ChannelRelayPlugin::OnRehash() { + Jupiter::Plugin::OnRehash(); + ChannelRelayPlugin::types.erase(); return this->initialize() ? 0 : -1; } diff --git a/Jupiter b/Jupiter index b990d5d..1b697ec 160000 --- a/Jupiter +++ b/Jupiter @@ -1 +1 @@ -Subproject commit b990d5d27facfd283ad4d36c70105d682a283cdc +Subproject commit 1b697ec73adfc406e4ad5244aae8d24978fa36d8 diff --git a/Release/Bot.lib b/Release/Bot.lib index 3ed59eb59b5974ee7270a52a37cfa40d7e9fcef3..378aaa3aa2052e1033392e15c1d60c868fd5d940 100644 GIT binary patch delta 1981 zcmZuxNla5w6m1yFE%Xnh2>JNd{PQRu*Mn8bJ3i2Ku=` zK!QICUT>dbxGs8DcC=z2XP6_7*cnHZVWu$&cH^kK=D5XhG9}2m5KlY(49|Ha*m5Gi z=Nwew_CdsBgX%7b-91dY`@Xahl0)Lai zmM7UonpsP7?H}kMy*$o1)PKQe`7qB#V|Rx!*TV29<14tV*-13(iRNo#8#KGQrqL%s zX98ohZa#w?nayW6;=kMzOp|&j%yMx=n5BUKP~ip$j$*x6N5y(^o*zfOOnWYcSjfY% zoCmQF9-d3*Ma<^S2(c2p^WrjgkXoDRG9J+x;kTC$%jmZV%# zh)4X~kl5^Pzq;8y0p$AvL9QQA3Q%DZn1jd-1;YYYf;U0Ej-H*F6wywKu+L^P5J~jF z?Pwh%nnEZ#9lFLaomYajD2o0J@y<~EW*G6M@D&xmCW3E=k0k3P+mSc8pebId%0&xa z9>@56gcn@6Qd^W?sp3I?H%5r&dGaX0^9noI!+hmTV~Y8)d;gj_NGqpiOt2km1;@CZ zF%%mz;~ZgJkQtxGn;E0fl&%E=|z%!(@kRyu$iotFJn7-m(@x0XQwg0pX7It{QK=K zusU5dEjhL&#rs~!vz+32=#0wK*w4na`ng_I@MmcU%P%fu%?#J3mpng%IuB;L{sQGS BJ3{~f delta 1981 zcmZuxJ4{ni7;bq83bBr=;bMAldIp&6@d8vZMXsgmk85#18<1HHinhmK|q>6r&f^@LQ4Br`0#%L}qE51{)O1N~ee zEWsZIuW=?BZj4`&9j!UX8RnWo?4m2qFzc8E2UDoK;kv_cG9{SvBA#`J7@qe_u%40N5|SoFV8X#^{@IY9pbrY?7Y0qa6i~2d1 z_apYf&vO|Ah&ckYLaYSu0=SHAq}B$yjHiqi_#NQGvIH?O9L%slS`ZnsJdnenwyE|I z;;|4nBsP05q-}Or82Q0)gzJZu0yLNewg_^gkx_vw!JCN5NYBnjifAQ8IA>;OA(rZb zyYXs9v_?^MI(m~~#()GHaTNU-<(;AU?NP*+N3U!6h8VsbL6WSUY{!n-3-wdwnq0Kt z)p3m9iSdHfD|N*Al`0pz{>FAii;^RcElNA59IY^4<+d_+(QO@ei z1lOdoh9oxR-sC*bFW?uF|HpR)Tz%4RO%*(8^2uh2uRh|dvMLD+ao#`b>+v=89wr<+ z;cT|}3I->hwmT)9c1qdE6yH4c^kQkg>DIAY*iKi;m$8?=&+4T4=cX}#h~#&X{70>g zus&TdEjhL^!~3r0S}Oq8`&=(6_)6Br@{0>;$Z>6Y$qPBud6?_?3(>+b AdjJ3c diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index 0e6d47722ad29ddad0a4fb286c395de6d2f15051..349325c4b82ce561f616388a1571cd68bbfe553e 100644 GIT binary patch delta 13613 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 I$-el10dqpey#N3J delta 13613 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 HvM>H$(FA^b diff --git a/RenX.Announcements/RenX_Announcements.cpp b/RenX.Announcements/RenX_Announcements.cpp index 921ac48..f44e933 100644 --- a/RenX.Announcements/RenX_Announcements.cpp +++ b/RenX.Announcements/RenX_Announcements.cpp @@ -64,6 +64,8 @@ void RenX_AnnouncementsPlugin::announce(unsigned int) int RenX_AnnouncementsPlugin::OnRehash() { + RenX::Plugin::OnRehash(); + RenX_AnnouncementsPlugin::timer->kill(); RenX_AnnouncementsPlugin::announcementsFile.unload(); return this->initialize() ? 0 : -1; diff --git a/RenX.Announcements/RenX_Announcements.h b/RenX.Announcements/RenX_Announcements.h index dbc23aa..0485e8f 100644 --- a/RenX.Announcements/RenX_Announcements.h +++ b/RenX.Announcements/RenX_Announcements.h @@ -34,7 +34,7 @@ public: public: // Jupiter::Plugin virtual bool initialize() override; - int OnRehash(); + int OnRehash() override; ~RenX_AnnouncementsPlugin(); private: diff --git a/RenX.Commands/RenX_Commands.cpp b/RenX.Commands/RenX_Commands.cpp index 85c8a8c..92354f1 100644 --- a/RenX.Commands/RenX_Commands.cpp +++ b/RenX.Commands/RenX_Commands.cpp @@ -80,6 +80,7 @@ bool RenX_CommandsPlugin::initialize() int RenX_CommandsPlugin::OnRehash() { + RenX::Plugin::OnRehash(); return this->initialize() ? 0 : -1; } diff --git a/RenX.Core/RenX_Server.h b/RenX.Core/RenX_Server.h index 32c1cff..b7ef2e3 100644 --- a/RenX.Core/RenX_Server.h +++ b/RenX.Core/RenX_Server.h @@ -73,7 +73,7 @@ namespace RenX * * @return 0. */ - virtual int OnRehash(); + virtual int OnRehash() override; /** * @brief Fires when a non-zero value is returned by an object during a call to rehash(). diff --git a/RenX.ExcessiveHeadshots/ExcessiveHeadshots.cpp b/RenX.ExcessiveHeadshots/ExcessiveHeadshots.cpp index b09001a..d9dbef3 100644 --- a/RenX.ExcessiveHeadshots/ExcessiveHeadshots.cpp +++ b/RenX.ExcessiveHeadshots/ExcessiveHeadshots.cpp @@ -38,6 +38,7 @@ bool RenX_ExcessiveHeadshotsPlugin::initialize() int RenX_ExcessiveHeadshotsPlugin::OnRehash() { + RenX::Plugin::OnRehash(); return this->initialize() ? 0 : -1; } diff --git a/RenX.ExtraLogging/RenX_ExtraLogging.cpp b/RenX.ExtraLogging/RenX_ExtraLogging.cpp index d5a149e..8109326 100644 --- a/RenX.ExtraLogging/RenX_ExtraLogging.cpp +++ b/RenX.ExtraLogging/RenX_ExtraLogging.cpp @@ -35,8 +35,11 @@ RenX_ExtraLoggingPlugin::~RenX_ExtraLoggingPlugin() int RenX_ExtraLoggingPlugin::OnRehash() { + RenX::Plugin::OnRehash(); + if (RenX_ExtraLoggingPlugin::file != nullptr) fclose(RenX_ExtraLoggingPlugin::file); + return this->initialize() ? 0 : -1; } diff --git a/RenX.Greetings/RenX_Greetings.cpp b/RenX.Greetings/RenX_Greetings.cpp index 7521344..4a884c6 100644 --- a/RenX.Greetings/RenX_Greetings.cpp +++ b/RenX.Greetings/RenX_Greetings.cpp @@ -62,6 +62,8 @@ void RenX_GreetingsPlugin::RenX_OnJoin(RenX::Server *server, const RenX::PlayerI int RenX_GreetingsPlugin::OnRehash() { + RenX::Plugin::OnRehash(); + RenX_GreetingsPlugin::greetingsFile.unload(); return RenX_GreetingsPlugin::initialize() ? 0 : -1; } diff --git a/RenX.IRCJoin/RenX_IRCJoin.cpp b/RenX.IRCJoin/RenX_IRCJoin.cpp index 63f47e9..9521b09 100644 --- a/RenX.IRCJoin/RenX_IRCJoin.cpp +++ b/RenX.IRCJoin/RenX_IRCJoin.cpp @@ -105,6 +105,8 @@ void RenX_IRCJoinPlugin::OnPart(Jupiter::IRC::Client *source, const Jupiter::Rea int RenX_IRCJoinPlugin::OnRehash() { + RenX::Plugin::OnRehash(); + return RenX_IRCJoinPlugin::initialize() ? 0 : -1; } diff --git a/RenX.Ladder.Web/RenX_Ladder_Web.cpp b/RenX.Ladder.Web/RenX_Ladder_Web.cpp index e4fa468..97bf058 100644 --- a/RenX.Ladder.Web/RenX_Ladder_Web.cpp +++ b/RenX.Ladder.Web/RenX_Ladder_Web.cpp @@ -34,7 +34,7 @@ bool RenX_Ladder_WebPlugin::initialize() RenX_Ladder_WebPlugin::web_hostname = this->config.get(Jupiter::ReferenceString::empty, "Hostname"_jrs, ""_jrs); RenX_Ladder_WebPlugin::web_path = this->config.get(Jupiter::ReferenceString::empty, "Path"_jrs, "/"_jrs); - this->OnRehash(); + this->init(); /** Initialize content */ Jupiter::HTTP::Server &server = getHTTPServer(); @@ -68,7 +68,7 @@ RenX_Ladder_WebPlugin::~RenX_Ladder_WebPlugin() server.remove(RenX_Ladder_WebPlugin::web_hostname, RenX_Ladder_WebPlugin::web_path, RenX_Ladder_WebPlugin::profile_page_name); } -int RenX_Ladder_WebPlugin::OnRehash() +void RenX_Ladder_WebPlugin::init() { FILE *file; int chr; @@ -155,7 +155,12 @@ int RenX_Ladder_WebPlugin::OnRehash() fclose(file); } } +} +int RenX_Ladder_WebPlugin::OnRehash() +{ + RenX::Plugin::OnRehash(); + this->init(); return 0; } diff --git a/RenX.Ladder.Web/RenX_Ladder_Web.h b/RenX.Ladder.Web/RenX_Ladder_Web.h index c2a4ebe..d18956d 100644 --- a/RenX.Ladder.Web/RenX_Ladder_Web.h +++ b/RenX.Ladder.Web/RenX_Ladder_Web.h @@ -53,6 +53,8 @@ public: // Jupiter::Plugin int OnRehash() override; private: + void init(); + /** Configuration variables */ size_t entries_per_page; size_t min_search_name_length; diff --git a/RenX.Listen/RenX_Listen.cpp b/RenX.Listen/RenX_Listen.cpp index 6a7a916..25f4140 100644 --- a/RenX.Listen/RenX_Listen.cpp +++ b/RenX.Listen/RenX_Listen.cpp @@ -53,6 +53,8 @@ int RenX_ListenPlugin::think() int RenX_ListenPlugin::OnRehash() { + RenX::Plugin::OnRehash(); + uint16_t port = this->config.getInt(Jupiter::ReferenceString::empty, STRING_LITERAL_AS_REFERENCE("Port"), 21337); const Jupiter::ReadableString &address = this->config.get(Jupiter::ReferenceString::empty, STRING_LITERAL_AS_REFERENCE("Address"), STRING_LITERAL_AS_REFERENCE("0.0.0.0")); RenX_ListenPlugin::serverSection = this->config.get(Jupiter::ReferenceString::empty, STRING_LITERAL_AS_REFERENCE("ServerSection"), this->getName()); diff --git a/RenX.Logging/RenX_Logging.cpp b/RenX.Logging/RenX_Logging.cpp index cc13edf..f478370 100644 --- a/RenX.Logging/RenX_Logging.cpp +++ b/RenX.Logging/RenX_Logging.cpp @@ -2257,6 +2257,7 @@ void RenX_LoggingPlugin::RenX_OnOther(RenX::Server *server, char token, const Ju int RenX_LoggingPlugin::OnRehash() { + RenX::Plugin::OnRehash(); return this->initialize() ? 0 : -1; } diff --git a/RenX.Medals/RenX_Medals.cpp b/RenX.Medals/RenX_Medals.cpp index 4ab9a40..f02adfd 100644 --- a/RenX.Medals/RenX_Medals.cpp +++ b/RenX.Medals/RenX_Medals.cpp @@ -264,6 +264,8 @@ void RenX_MedalsPlugin::RenX_OnDestroy(RenX::Server *server, const RenX::PlayerI int RenX_MedalsPlugin::OnRehash() { + RenX::Plugin::OnRehash(); + RenX_MedalsPlugin::medalsFile.sync(RenX_MedalsPlugin::medalsFileName); RenX_MedalsPlugin::medalsFile.flushData(); init(); diff --git a/RenX.ModSystem/RenX_ModSystem.cpp b/RenX.ModSystem/RenX_ModSystem.cpp index 9836530..beaf71c 100644 --- a/RenX.ModSystem/RenX_ModSystem.cpp +++ b/RenX.ModSystem/RenX_ModSystem.cpp @@ -407,6 +407,8 @@ void RenX_ModSystemPlugin::RenX_OnAdminLogout(RenX::Server *server, const RenX:: int RenX_ModSystemPlugin::OnRehash() { + RenX::Plugin::OnRehash(); + RenX_ModSystemPlugin::modsFile.flushData(); while (RenX_ModSystemPlugin::groups.size() != 0) delete RenX_ModSystemPlugin::groups.remove(0U); diff --git a/RenX.ModSystem/RenX_ModSystem.h b/RenX.ModSystem/RenX_ModSystem.h index 2f1414a..cbaaa61 100644 --- a/RenX.ModSystem/RenX_ModSystem.h +++ b/RenX.ModSystem/RenX_ModSystem.h @@ -102,7 +102,7 @@ public: // RenX::Plugin void RenX_OnAdminLogout(RenX::Server *server, const RenX::PlayerInfo *player) override; public: // Jupiter::Plugin - int OnRehash(); + int OnRehash() override; Jupiter::INIFile &modsFile = Jupiter::Plugin::config; private: diff --git a/RenX.Warn/RenX_Warn.cpp b/RenX.Warn/RenX_Warn.cpp index 12a7a4a..6e794ca 100644 --- a/RenX.Warn/RenX_Warn.cpp +++ b/RenX.Warn/RenX_Warn.cpp @@ -30,6 +30,7 @@ bool RenX_WarnPlugin::initialize() int RenX_WarnPlugin::OnRehash() { + RenX::Plugin::OnRehash(); return this->initialize() ? 0 : -1; }