[asterisk-dev] [Code Review] 3326: Sorcery: Do not apply the same wizard to an object type twice; Automatically apply sorcery configuration when sorcery is opened.

[Mark Michelson]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviewboard.asterisk.org/r/3326/
-----------------------------------------------------------

(Updated March 15, 2014, 5:29 p.m.)


Review request for Asterisk Developers.


Changes
-------

One final change.

I was having trouble from a test because res_mwi_external was failing to load because ast_sorcery_apply_default() was returning an error. This is because for my test, I had a sorcery.conf that had a "res_mwi_external" section. The default "astdb" wizard could not be applied because the object type the wizard was being applied to had already been added to sorcery when the config had been applied.

I've adjusted the return type of ast_sorcery_apply_config and ast_sorcery_apply_default to return an enum that indicates more accurately what happened. The return values are backwards compatible with old code that may have been checking for success or failure, but it also now can return more specific values for cases where "success" and "failure" are not as well defined.

All unit tests still pass.


Repository: Asterisk


Description
-------

When performing some realtime tests, I noticed that the AMI command PJSIPShowEndpoints was listing all of my endpoints twice. This is because ast_sorcery_apply_config() was being called twice from res_pjsip code, once when initializing system configuration, and once again when initializing the rest of the configuration data. This patch aims to fix the problem on two fronts:

1) Remove the ast_sorcery_apply_config() calls from the PJSIP code entirely in favor of having sorcery automatically apply configuration for the module when sorcery is opened. This reduces the chance of accidentally attempting to apply the same configuration twice. I also removed the call to ast_sorcery_apply_config from res_mwi_external since it is no longer necessary either.

2) Adjust sorcery_apply_wizard_mapping() not to apply the same wizard to an object type more than once, just in case someone does make the error of calling ast_sorcery_apply_config() multiple times for the same object type.


Diffs (updated)
-----

  /branches/12/tests/test_sorcery_realtime.c 410625 
  /branches/12/tests/test_sorcery_astdb.c 410606 
  /branches/12/tests/test_sorcery.c 410606 
  /branches/12/res/res_pjsip/pjsip_configuration.c 410606 
  /branches/12/res/res_pjsip/config_system.c 410606 
  /branches/12/res/res_mwi_external.c 410606 
  /branches/12/main/sorcery.c 410606 
  /branches/12/include/asterisk/sorcery.h 410606 
  /branches/12/configs/sorcery.conf.sample 410606 

Diff: https://reviewboard.asterisk.org/r/3326/diff/


Testing
-------

My tests of retrieving data from realtime now get the expected objects. I don't have any automated tests to post yet because the realtime testsuite is a work in progress.


Thanks,

Mark Michelson

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-dev/attachments/20140315/3f30d93b/attachment.html>