- sys.argv[0] is now always ./fba.py, so let's take the function's name
instead
status = 101
elif fba.is_instance_registered(args.domain):
print(f"WARNING: args.domain='{args.domain}' is already registered")
status = 101
elif fba.is_instance_registered(args.domain):
print(f"WARNING: args.domain='{args.domain}' is already registered")
else:
print(f"INFO: args.domain='{args.domain}' is not known")
else:
print(f"INFO: args.domain='{args.domain}' is not known")
print(f"INFO: Adding {len(domains)} new instances ...")
for domain in domains:
print(f"INFO: Fetching instances from domain='{domain}' ...")
print(f"INFO: Adding {len(domains)} new instances ...")
for domain in domains:
print(f"INFO: Fetching instances from domain='{domain}' ...")
- fba.fetch_instances(domain, None, None, sys.argv[0])
+ fba.fetch_instances(domain, None, None, __name__)
# DEBUG: print("DEBUG: EXIT!")
# DEBUG: print("DEBUG: EXIT!")
continue
elif not fba.is_instance_registered(blocked):
# DEBUG: print(f"DEBUG: Domain blocked='{blocked}' wasn't found, adding ..., blocker='{blocker}',origin='{origin}',nodeinfo_url='{nodeinfo_url}'")
continue
elif not fba.is_instance_registered(blocked):
# DEBUG: print(f"DEBUG: Domain blocked='{blocked}' wasn't found, adding ..., blocker='{blocker}',origin='{origin}',nodeinfo_url='{nodeinfo_url}'")
- fba.add_instance(blocked, blocker, sys.argv[0], nodeinfo_url)
+ fba.add_instance(blocked, blocker, __name__, nodeinfo_url)
if not fba.is_instance_blocked(blocker, blocked, block_level):
# DEBUG: print("DEBUG: Blocking:", blocker, blocked, block_level)
if not fba.is_instance_blocked(blocker, blocked, block_level):
# DEBUG: print("DEBUG: Blocking:", blocker, blocked, block_level)
continue
elif not fba.is_instance_registered(blocked):
# DEBUG: print(f"DEBUG: Domain blocked='{blocked}' wasn't found, adding ..., blocker='{blocker}',origin='{origin}',nodeinfo_url='{nodeinfo_url}'")
continue
elif not fba.is_instance_registered(blocked):
# DEBUG: print(f"DEBUG: Domain blocked='{blocked}' wasn't found, adding ..., blocker='{blocker}',origin='{origin}',nodeinfo_url='{nodeinfo_url}'")
- fba.add_instance(blocked, blocker, sys.argv[0], nodeinfo_url)
+ fba.add_instance(blocked, blocker, __name__, nodeinfo_url)
# DEBUG: print("DEBUG: Updating block reason:", blocker, blocked, reason["reason"])
fba.update_block_reason(reason["reason"], blocker, blocked, block_level)
# DEBUG: print("DEBUG: Updating block reason:", blocker, blocked, reason["reason"])
fba.update_block_reason(reason["reason"], blocker, blocked, block_level)
continue
elif not fba.is_instance_registered(blocked):
# DEBUG: print(f"DEBUG: Domain blocked='{blocked}' wasn't found, adding ..., blocker='{blocker}',origin='{origin}',nodeinfo_url='{nodeinfo_url}'")
continue
elif not fba.is_instance_registered(blocked):
# DEBUG: print(f"DEBUG: Domain blocked='{blocked}' wasn't found, adding ..., blocker='{blocker}',origin='{origin}',nodeinfo_url='{nodeinfo_url}'")
- fba.add_instance(blocked, blocker, sys.argv[0], nodeinfo_url)
+ fba.add_instance(blocked, blocker, __name__, nodeinfo_url)
elif not validators.domain(blocked):
print(f"WARNING: blocked='{blocked}',software='{software}' is not a valid domain name - skipped!")
continue
elif not validators.domain(blocked):
print(f"WARNING: blocked='{blocked}',software='{software}' is not a valid domain name - skipped!")
continue
continue
elif not fba.is_instance_registered(blocked):
# DEBUG: print("DEBUG: Hash wasn't found, adding:", blocked, blocker)
continue
elif not fba.is_instance_registered(blocked):
# DEBUG: print("DEBUG: Hash wasn't found, adding:", blocked, blocker)
- fba.add_instance(blocked, blocker, sys.argv[0], nodeinfo_url)
+ fba.add_instance(blocked, blocker, __name__, nodeinfo_url)
blocking = blocked if blocked.count("*") <= 1 else blocked_hash
# DEBUG: print(f"DEBUG: blocking='{blocking}',blocked='{blocked}',blocked_hash='{blocked_hash}'")
blocking = blocked if blocked.count("*") <= 1 else blocked_hash
# DEBUG: print(f"DEBUG: blocking='{blocking}',blocked='{blocked}',blocked_hash='{blocked_hash}'")
continue
elif not fba.is_instance_registered(blocked):
# DEBUG: print("DEBUG: Hash wasn't found, adding:", blocked, blocker)
continue
elif not fba.is_instance_registered(blocked):
# DEBUG: print("DEBUG: Hash wasn't found, adding:", blocked, blocker)
- fba.add_instance(blocked, blocker, sys.argv[0], nodeinfo_url)
+ fba.add_instance(blocked, blocker, __name__, nodeinfo_url)
if not fba.is_instance_blocked(blocker, blocked, block_level):
fba.block_instance(blocker, blocked, reason, block_level)
if not fba.is_instance_blocked(blocker, blocked, block_level):
fba.block_instance(blocker, blocked, reason, block_level)
continue
elif not fba.is_instance_registered(blocked):
# DEBUG: print(f"DEBUG: Domain blocked='{blocked}' wasn't found, adding ..., blocker='{blocker}',origin='{origin}',nodeinfo_url='{nodeinfo_url}'")
continue
elif not fba.is_instance_registered(blocked):
# DEBUG: print(f"DEBUG: Domain blocked='{blocked}' wasn't found, adding ..., blocker='{blocker}',origin='{origin}',nodeinfo_url='{nodeinfo_url}'")
- fba.add_instance(blocked, blocker, sys.argv[0], nodeinfo_url)
+ fba.add_instance(blocked, blocker, __name__, nodeinfo_url)
if not fba.is_instance_blocked(blocker, blocked, "reject"):
# DEBUG: print(f"DEBUG: blocker='{blocker}' is blocking '{blocked}' for unknown reason at this point")
if not fba.is_instance_blocked(blocker, blocked, "reject"):
# DEBUG: print(f"DEBUG: blocker='{blocker}' is blocking '{blocked}' for unknown reason at this point")
# DEBUG: print(f"DEBUG: row='{row}'")
if not fba.is_instance_registered(row["domain"]):
print(f"INFO: Fetching instances from domain='{row['domain']}' ...")
# DEBUG: print(f"DEBUG: row='{row}'")
if not fba.is_instance_registered(row["domain"]):
print(f"INFO: Fetching instances from domain='{row['domain']}' ...")
- fba.fetch_instances(row["domain"], None, None, sys.argv[0])
+ fba.fetch_instances(row["domain"], None, None, __name__)
if not fba.is_instance_blocked('chaos.social', row["domain"], block_level):
# DEBUG: print(f"DEBUG: domain='{row['domain']}',block_level='{block_level}' blocked by chaos.social, adding ...")
if not fba.is_instance_blocked('chaos.social', row["domain"], block_level):
# DEBUG: print(f"DEBUG: domain='{row['domain']}',block_level='{block_level}' blocked by chaos.social, adding ...")
print(f"INFO: Adding {len(domains)} new instances ...")
for domain in domains:
print(f"INFO: Fetching instances from domain='{domain}' ...")
print(f"INFO: Adding {len(domains)} new instances ...")
for domain in domains:
print(f"INFO: Fetching instances from domain='{domain}' ...")
- fba.fetch_instances(domain, None, None, sys.argv[0])
+ fba.fetch_instances(domain, None, None, __name__)
# DEBUG: print("DEBUG: EXIT!")
# DEBUG: print("DEBUG: EXIT!")
print(f"INFO: Adding {len(domains)} new instances ...")
for domain in domains:
print(f"INFO: Fetching instances from domain='{domain}' ...")
print(f"INFO: Adding {len(domains)} new instances ...")
for domain in domains:
print(f"INFO: Fetching instances from domain='{domain}' ...")
- fba.fetch_instances(domain, None, None, sys.argv[0])
+ fba.fetch_instances(domain, None, None, __name__)
# DEBUG: print("DEBUG: EXIT!")
# DEBUG: print("DEBUG: EXIT!")
boot.acquire_lock()
# Initial fetch
boot.acquire_lock()
# Initial fetch
- fba.fetch_instances(args.domain, None, None, sys.argv[0])
+ fba.fetch_instances(args.domain, None, None, __name__)
if args.single:
# DEBUG: print(f"DEBUG: Not fetching more instances - EXIT!")
if args.single:
# DEBUG: print(f"DEBUG: Not fetching more instances - EXIT!")
continue
print(f"INFO: Fetching instances for instance '{row[0]}' ('{row[2]}') of origin='{row[1]}',nodeinfo_url='{row[3]}'")
continue
print(f"INFO: Fetching instances for instance '{row[0]}' ('{row[2]}') of origin='{row[1]}',nodeinfo_url='{row[3]}'")
- fba.fetch_instances(row[0], row[1], row[2], sys.argv[0], row[3])
+ fba.fetch_instances(row[0], row[1], row[2], __name__, row[3])
# DEBUG: print("DEBUG: EXIT!")
# DEBUG: print("DEBUG: EXIT!")
try:
if not is_instance_registered(instance):
# DEBUG: print("DEBUG: Adding new instance:", instance, domain)
try:
if not is_instance_registered(instance):
# DEBUG: print("DEBUG: Adding new instance:", instance, domain)
- add_instance(instance, domain, sys.argv[0])
+ add_instance(instance, domain, script)
except BaseException as e:
print(f"ERROR: instance='{instance}',exception[{type(e)}]:'{str(e)}'")
continue
except BaseException as e:
print(f"ERROR: instance='{instance}',exception[{type(e)}]:'{str(e)}'")
continue
text-align: center;
font-family: sans;
}
text-align: center;
font-family: sans;
}
- pre {
- margin: 0px;
- }
.block_level {
background-color: #1c1c3c;
width: 80em;
.block_level {
background-color: #1c1c3c;
width: 80em;
{% if software %}
{{entry['domain']}}
{% elif originator %}
{% if software %}
{{entry['domain']}}
{% elif originator %}
- <pre>{{entry['domain']}}</pre>
{% elif entry['domain'] == None %}
-
{% else %}
{% elif entry['domain'] == None %}
-
{% else %}