Fixup priorities

This commit is contained in:
Vlad Grigorescu 2021-04-26 21:46:18 -05:00
parent f8b06becd2
commit 6d0f48abfc
3 changed files with 7 additions and 4 deletions

View file

@ -18,7 +18,8 @@ export {
}; };
} }
hook notice(n: Notice::Info) &priority=-5 # Run before ACTION_PAGE
hook notice(n: Notice::Info) &priority=5
{ {
if ( |Site::local_admins| > 0 && if ( |Site::local_admins| > 0 &&
ACTION_EMAIL_ADMIN in n$actions ) ACTION_EMAIL_ADMIN in n$actions )

View file

@ -17,7 +17,8 @@ export {
option mail_page_dest = ""; option mail_page_dest = "";
} }
hook notice(n: Notice::Info) &priority=-6 # Runs after EMAIL_ADMIN (assume page supercedes), but before hostnames are added.
hook notice(n: Notice::Info) &priority=4
{ {
if ( ACTION_PAGE in n$actions ) if ( ACTION_PAGE in n$actions )
n$email_dest = mail_page_dest; n$email_dest = mail_page_dest;

View file

@ -13,7 +13,8 @@ module Notice;
# reference to the original notice) # reference to the original notice)
global tmp_notice_storage: table[string] of Notice::Info &create_expire=max_email_delay+10secs; global tmp_notice_storage: table[string] of Notice::Info &create_expire=max_email_delay+10secs;
hook notice(n: Notice::Info) &priority=-10 # Run after e-mail address is set, but before e-mail is sent.
hook notice(n: Notice::Info) &priority=0
{ {
if ( ! n?$src && ! n?$dst ) if ( ! n?$src && ! n?$dst )
return; return;