<p>George Joseph <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/10351">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Richard Mudgett: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">loader: Fix result of module reload error.<br><br>When a module reload fails we never set AST_MODULE_RELOAD_ERROR.  This<br>caused reload failures to incorrectly report 'No module found'.<br><br>Change-Id: I5f3953e0f7d135e53ec797f24c97ee3f73f232e7<br>---<br>M main/loader.c<br>1 file changed, 9 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/main/loader.c b/main/loader.c</span><br><span>index 30a9832..07c43f0 100644</span><br><span>--- a/main/loader.c</span><br><span>+++ b/main/loader.c</span><br><span>@@ -997,14 +997,14 @@</span><br><span> </span><br><span>   if (ast_opt_lock_confdir) {</span><br><span>          int try;</span><br><span style="color: hsl(0, 100%, 40%);">-                int res;</span><br><span style="color: hsl(0, 100%, 40%);">-                for (try = 1, res = AST_LOCK_TIMEOUT; try < 6 && (res == AST_LOCK_TIMEOUT); try++) {</span><br><span style="color: hsl(0, 100%, 40%);">-                 res = ast_lock_path(ast_config_AST_CONFIG_DIR);</span><br><span style="color: hsl(0, 100%, 40%);">-                 if (res == AST_LOCK_TIMEOUT) {</span><br><span style="color: hsl(120, 100%, 40%);">+                int lockres;</span><br><span style="color: hsl(120, 100%, 40%);">+          for (try = 1, lockres = AST_LOCK_TIMEOUT; try < 6 && (lockres == AST_LOCK_TIMEOUT); try++) {</span><br><span style="color: hsl(120, 100%, 40%);">+                       lockres = ast_lock_path(ast_config_AST_CONFIG_DIR);</span><br><span style="color: hsl(120, 100%, 40%);">+                   if (lockres == AST_LOCK_TIMEOUT) {</span><br><span>                           ast_log(LOG_WARNING, "Failed to grab lock on %s, try %d\n", ast_config_AST_CONFIG_DIR, try);</span><br><span>                       }</span><br><span>            }</span><br><span style="color: hsl(0, 100%, 40%);">-               if (res != AST_LOCK_SUCCESS) {</span><br><span style="color: hsl(120, 100%, 40%);">+                if (lockres != AST_LOCK_SUCCESS) {</span><br><span>                   ast_log(AST_LOG_WARNING, "Cannot grab lock on %s\n", ast_config_AST_CONFIG_DIR);</span><br><span>                   res = AST_MODULE_RELOAD_ERROR;</span><br><span>                       goto module_reload_done;</span><br><span>@@ -1016,6 +1016,8 @@</span><br><span>             if (!name || !strcasecmp(name, reload_classes[i].name)) {</span><br><span>                    if (reload_classes[i].reload_fn() == AST_MODULE_LOAD_SUCCESS) {</span><br><span>                              res = AST_MODULE_RELOAD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+                      } else if (res == AST_MODULE_RELOAD_NOT_FOUND) {</span><br><span style="color: hsl(120, 100%, 40%);">+                              res = AST_MODULE_RELOAD_ERROR;</span><br><span>                       }</span><br><span>            }</span><br><span>    }</span><br><span>@@ -1057,6 +1059,8 @@</span><br><span>            ast_verb(3, "Reloading module '%s' (%s)\n", cur->resource, info->description);</span><br><span>               if (info->reload() == AST_MODULE_LOAD_SUCCESS) {</span><br><span>                  res = AST_MODULE_RELOAD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+              } else if (res == AST_MODULE_RELOAD_NOT_FOUND) {</span><br><span style="color: hsl(120, 100%, 40%);">+                      res = AST_MODULE_RELOAD_ERROR;</span><br><span>               }</span><br><span>            if (name) {</span><br><span>                  break;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10351">change 10351</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/10351"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I5f3953e0f7d135e53ec797f24c97ee3f73f232e7 </div>
<div style="display:none"> Gerrit-Change-Number: 10351 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 (1000185) </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>