From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: network@lists.ipfire.org
Subject: Re: [PATCH 2/2] header-zone: refactor hook_config_destroy
Date: Wed, 12 Jul 2017 18:12:07 -0400
Message-ID: <1499897527.2292.8.camel@ipfire.org>
In-Reply-To: <1499687638-6853-2-git-send-email-jonatan.schlag@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5792808247932983882=="
List-Id: <network.lists.ipfire.org>

--===============5792808247932983882==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

Hi,

On Mon, 2017-07-10 at 13:53 +0200, Jonatan Schlag wrote:
> We now just bring the hook down, execute hook_destroy which can be
> not empty inside the hook,
> because it is defined in src/header-config.
> After this we delete the config file.
> 
> Fixes: #11416
> 
> Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
> ---
>  src/header-config | 4 ++++
>  src/header-zone   | 6 ++++++
>  2 files changed, 10 insertions(+)
> 
> diff --git a/src/header-config b/src/header-config
> index b697797..d55d7e5 100644
> --- a/src/header-config
> +++ b/src/header-config
> @@ -22,3 +22,7 @@
>  hook_new() {
>  	cmd_not_implemented
>  }
> +
> +hook_destroy() {
> +	return ${EXIT_OK}
> +}
> diff --git a/src/header-zone b/src/header-zone
> index 2e3fa09..b4588fb 100644
> --- a/src/header-zone
> +++ b/src/header-zone
> @@ -221,7 +221,13 @@ hook_config_destroy() {
>  	local hook=$(zone_config_get_hook_from_id ${zone}  ${id})
>  	assert isset hook
>  
> +	# First we bring the hook down
> +	hook_config_cmd "down" "${zone}" "${hook}" "${hook}.${id}"
> +	# If a hook_destroy function is implemented in the hook this
> function will be executed.
> +	# If not a empty defined in header-config is executed.
>  	hook_config_cmd "destroy" "${zone}" "${hook}"
> "${hook}.${id}" "$@"
> +	# Now we delete the config of the zone
> +	zone_config_settings_destroy "${zone}" "${hook}.${id}"
>  }
>  
>  hook_config_edit() {

1) Please use spaces before starting a new block of comments. This is
really hard to read here.

2) Do we not need to catch any errors? For example if hook_destroy()
returns an error, this just goes on which I think is not right.

Best,
-Michael

--===============5792808247932983882==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC
Q2dBR0JRSlpacDYzQUFvSkVJQjU4UDl2a0FrSGhQUVAvaVJvNHc5emdPU0hIdGlCZGorMWZBMzYK
bHJBR3VGUEVDNVlYUW1IZ1A0bGJaMFBxOXpMSXRRdGJqN1dRMjAwbTNLM0o2OHg0S0gxd0NldmNl
WWhxbUJKOQp1ZDRsL3FzWGhWbEFiMzVVeENIR2plZ1BmMjRqMjc0WURHaXE2b2NSUXNRT01HaHVH
NVUvZEkyTVNSd0dCTDg4Ck9Hd3NZUmxSK05oZ0EwR2ZVbnRuNGVUU1ZpdUN6dk5kYTU0eFUvTFFz
d2x1Yi92OUJXRm5vbnlFL0RMeUJoaXoKVHhLYi9IWnVnTlJzMG1hQXhOOWIvaXNGL0t6WHYzbEZk
Q2ducWVQYXNScnA3WlNVZkJPaHc3eGF2aDRHNVNzSAo5YkFkdHhLdXh1Vk5iVWNSeDUwVjZEaHNk
enZ5d0Y0YkpJQmNDY3Mxb09wQjhNWDNRVGVacTNaRjcxd2JDczRsClY1ZlRzajVpUUc2Q2ZYZitF
VEh4dTFsNlZMZGxqdUJ0T1oveU1NN2J0bEZJdXIwTEliTzdaSEFoQnhvbGpmZWEKcFhlVzdLcnQv
ZUs1YmdhUk1hOGJ2d3JxTWt5VGgySE9wdGRqMXZzRHlOYTBKYVUzeW1XVndmazcxUVRYMVBXRApq
Umg3YkRXSmRsRFcweGZzNkxieFN0VlByQW9RbG1WcitXZFZyOXQrWEZVRVJkUlMycjl0V0doK2hH
L1Fjb3IxCmxGRWFoOHkrK1FvS2w3ejBQa0R2K0NpcFFVa2VycGdiY0J1azhKTEg1bDBCR0c5U3lz
ZVlBZ2kxSjNsVUxoS0UKOVpYSmlMdGNGV2RhaGRIdUtMak96N1lmbm1oSDIvNEJOWWZ5SVJKNWxu
K3pDMGFyclJRbjQycVpUc1U0QUduMAoyTUxjQ090ZjYzUWtWa2hqUDZ6Two9QjA2VAotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============5792808247932983882==--