raise ValueError(f"Parameter block_level[]='{type(block_level)}' is not 'str'")
elif block_level == "":
raise ValueError("Parameter 'block_level' is empty")
- elif block_level == "accept":
- raise ValueError("Accepted domains are not wanted here")
+ elif block_level in ["accept", "suspended", "silenced"]:
+ raise ValueError(f"block_level='{block_level}' is not wanted.")
logger.debug("Updating block reason='%s',blocker='%s',blocked='%s',block_level='%s'", reason, blocker, blocked, block_level)
database.cursor.execute(
raise ValueError(f"Parameter block_level[]='{type(block_level)}' is not 'str'")
elif block_level == "":
raise ValueError("Parameter 'block_level' is empty")
- elif block_level == "accept":
+ elif block_level in ["accept", "suspended", "silenced"]:
raise ValueError("Accepted domains are not wanted here")
database.cursor.execute(
raise ValueError(f"Parameter block_level[]='{type(block_level)}' is not of type 'str'")
elif block_level == "":
raise ValueError("Parameter 'block_level' is empty")
- elif block_level == "accept":
+ elif block_level in ["accept", "suspended", "silenced"]:
raise ValueError("Accepted domains are not wanted here")
database.cursor.execute(
raise Exception(f"blocker='{blocker}' is blacklisted but function invoked")
elif blacklist.is_blacklisted(blocked):
raise Exception(f"blocked='{blocked}' is blacklisted but function invoked")
- elif block_level == "accept":
+ elif block_level in ["accept", "suspended", "silenced"]:
raise ValueError("Accepted domains are not wanted here")
if reason is not None:
"blocker" : domain,
"blocked" : tidyup.domain(instance["host"]),
"reason" : None,
- "block_level": "suspended",
+ "block_level": "suspend",
})
logger.debug("count=%d", count)
elif block_level == "accept":
logger.debug("domain='%s' skipping block_level='accept'", domain)
continue
+ elif block_level == "suspended":
+ logger.debug("domain='%s', mapping 'suspended' to 'suspend'", domain)
+ block_level = "suspend"
+ elif block_level == "silenced":
+ logger.debug("domain='%s', mapping 'silenced' to 'silence'", domain)
+ block_level = "silence"
logger.debug("Checking %d entries from domain='%s',block_level='%s' ...", len(blocklist), domain, block_level)
if len(blocklist) > 0:
elif block_level == "accept":
logger.debug("domain='%s' skipping block_level='accept'", domain)
continue
+ elif block_level == "suspended":
+ logger.debug("domain='%s', mapping 'suspended' to 'suspend'", domain)
+ block_level = "suspend"
+ elif block_level == "silenced":
+ logger.debug("domain='%s', mapping 'silenced' to 'silence'", domain)
+ block_level = "silence"
logger.debug("Checking %d entries from domain='%s',block_level='%s' ...", len(info.items()), domain, block_level)
for blocked, reason in info.items():