be952c2771
* prepare codebase to create scheduled tasks
there is some prep work involved with this. the scheduler would be happy
if this work was done. simply, we extract out the `created_utc`
interface from *everything* that uses it such that we don't have to
repeat ourselves a bunch. all fun stuff.
next commit is the meat of it.
* cron: basic backend work for scheduler
* avoid ipmort loop
* attempt 2 at fixing import loops
* parathensize because operator precedence
* delete file that came back for some reason.
* does NOPing the oauth apps work?
* import late and undo clients.py change
* stringify column names.
* reorder imports.
* remove task reference
* fix missing mapper object
* make coupled to repeatabletask i guess
* sanitize: fix sanitize imports
* import shadowing crap
* re-shadow shadowed variable
* fix regexes
* use the correct not operator
* readd missing commit
* scheduler: SQLA only allows concrete relations
* implement submission scheduler
* fix import loop with db_session
* get rid of import loop in submission.py and comment.py
* remove import loops by deferring import until function clal
* i give up.
* awful.
* ...
* fix another app import loop
* fix missing import in route handler
* fix import error in wrappers.py
* fix wrapper error
* call update wrapper in the admin_level_required case
* :marseyshrug:
* fix issue with wrapper
* some cleanup and some fixes
* some more cleanup
let's avoid polluting scopes where we can.
* ...
* add SCHEDULED_POSTS permission.
* move const.py into config like the other files.
* style fixes.
* lock table for concurrency improvements
* don't attempt to commit on errors
* Refactor code, create `TaskRunContext`, create python callable task type.
* use import contextlib
* testing stuff i guess.
* handle repeatable tasks properly.
* Attempt another fix at fighting the mapper
* do it right ig
* SQLA1.4 doesn't support nested polymorphism ig
* fix errenous class import
* fix mapper errors
* import app in wrappers.py
* fix import failures and stuff like that.
* embed and import fixes
* minor formatting changes.
* Add running state enum and don't attempt to check for currently running tasks.
* isort
* documentation, style, and commit after each task.
* Add completion time and more docs, rename, etc
* document `CRON_SLEEP_SECONDS` better.
* add note about making LiteralString
* filter out tasks that have been run in the future
* reference RepeatableTask's `__tablename__` directly
* use a master/slave configuration for tasks
the master periodically checks to see if the slave is alive, healthy,
and not taking too many resources, and if applicable kills its
child and restarts it.
only one relation is supported at the moment.
* don't duplicate process unnecessarily
* note impl detail, add comments
* fix imports.
* getting imports to stop being stupid.
* environment notes.
* syntax derp
* *sigh*
* stupid environment stuff
* add UI for submitting a scheduled post
* stupid things i need to fix the user class
* ...
* fix template
* add formkey
* pass v
* add hour and minute field
* bleh
* remove concrete
* the sqlalchemy docs are wrong
* fix me being dumb and not understanding error messages
* missing author attribute for display
* author_name property
* it's a property
* with_polymorphic i think fixes this
* dsfavgnhmjk
* *sigh*
* okay try this again
* try getting rid of the comment section
* include -> extends
* put the div outside of the thing.
* fix user page listings :/
* mhm
* i hate this why isn't this working
* this should fix it
* Fix posts being set as disabled by default
* form UI imrpovements
* label
* <textarea>s should have their closing tag
* UI fixes.
* and fix errenous spinner thing.
* don't abort(415) when browsers send 0 length files for some reason
* UI improvements
* line break.
* CSS :S
* better explainer
* don't show moderation buttons for scheduled posts
* ...
* meh
* add edit form
* include forms on default page.
* fix hour minute selectino.
* improve ui i guess and add api
* Show previous postings on scheduled task page
* create task id
* sqla
* posts -> submissions
* fix OTM relationship
* edit URL
* use common formkey control
* Idk why this isn't working
* Revert "Idk why this isn't working"
This reverts commit 3b93f741df.
* does removing viewonly fix it?
* don't import routes on db migrations
* apparently this has to be a string
* UI improvements redux
* margins and stuff
* add cron to supervisord
* remove stupid duplication
* typo fix
* postgres syntax error
* better lock and error handling
* add relationship between task and runs
* fix some ui stuff
* fix incorrect timestamp comparison
* ...
* Fix logic errors blocking scheduled posts
Two bugs here:
- RepeatableTask.run_time_last <= now: run_time_last is NULL by
default. NULL is not greater than, less than, or equal to any
value. We use NULL to signify a never-run task; check for that
condition when building the task list.
- `6 <= weekday <= 0`: there is no integer that is both gte 6 and
lte 0. This was always false.
* pasthrough worker process STDOUT and STDERR
* Add scheduler to admin panel
* scheduler
* fix listing and admin home
* date formatting ixes
* fix ages
* task user interface
* fix some more import crap i have to deal with
* fix typing
* avoid import loop
* UI fixes
* fix incorrect type
* task type
* Scheduled task UI improvements (add runs and stuff)
* make the width a lil bit smaller
* task runs.
* fix submit page
* add alembic migration
* log on startup
* Fix showing edit button
* Fix logic for `can_edit` (accidentally did `author_id` instead of `id`)
* Broad review pass
Review:
- Call `invalidate_cache` with `is_html=` explicitly for clarity,
rather than a bare boolean in the call args.
- Remove `marseys_const*` and associated stateful const system:
the implementation was good if we needed them, but TheMotte
doesn't use emoji, and a greenfield emoji system would likely
not keep those darned lists floating in thread-local scope.
Also they were only needed for goldens and random emoji, which
are fairly non-central features.
- Get `os.environ` fully out of the templates by using the new
constants we already have in files.helpers.config.environment.
- Given files.routes.posts cleanup,get rid of shop discount dict.
It's already a mapping of badge IDs to discounts for badges that
likely won't continue to exist (if they even do at present).
- RepeatableTaskRun.exception: use `@property.setter` instead of
overriding `__setattr__`.
Fix:
- Welcome message literal contained an indented Markdown code block.
- Condition to show "View source" button changed to show source to
logged out. This may well be a desirable change, but it's not
clearly intended here.
* Fix couple of routing issues
* fix 400 with post body editing
* Add error handler for HTTP 415
* fix router giving wrong arg name to handler
* Use supervisord to monitor memory rather than DIY
Also means we're using pip for getting supervisord now, so we don't rely
on the Debian image base for any packages.
* fix task run elapsed time display
* formatting and removing redundant code
* Fix missing ModAction import
* dates and times fixes
* Having to modify imports here anyway, might as
well change it.
* correct documentation.
* don't use urlunparse
* validators: import sanitize instead of from syntax
* cron: prevent races on task running
RepeatableTask.run_state_enum acts as the mutex on repeatable tasks.
Previously, the list of tasks to run was acquired before individually
locking each task. However, there was a period where the table is both
unlocked and the tasks are in state WAITING between those points.
This could potentially have led to two 'cron' processes each running the
same task simultaneously. Instead, we check for runnability both when
building the preliminary list and when mutexing the task via run state
in the database.
Also:
- g.db and the cron db object are both instances of `Session`, not
`scoped_session` because they are obtained from
`scoped_session.__call__`, which acts as a `Session` factory.
Propagate this to the type hints.
- Sort order of task run submissions so /tasks/scheduled_posts/<id>
"Previous Task Runs" listings are useful.
* Notify followers on post publication
This was old behavior lost in the refactoring of the submit endpoint.
Also fix an AttributeError in `Follow.__repr__` which carried over
from all the repr copypasta.
* Fix image attachment
Any check for `file.content_length` relies on browsers sending
Content-Length headers with the request. It seems that few actually do.
The pre-refactor approach was to check for truthiness, which excludes
both None and the strange empty strings that we seem to get in absence
of a file upload. We return to doing so.
---------
Co-authored-by: TLSM <duolsm@outlook.com>
109 lines
4.2 KiB
Python
109 lines
4.2 KiB
Python
'''
|
|
Environment data. Please don't use `files.helpers.config.const` for things that
|
|
aren't constants. If it's an environment configuration, it should go in here.
|
|
'''
|
|
|
|
from os import environ
|
|
|
|
from files.helpers.strings import bool_from_string
|
|
|
|
SITE = environ.get("DOMAIN", '').strip()
|
|
SITE_ID = environ.get("SITE_ID").strip()
|
|
SITE_TITLE = environ.get("SITE_TITLE").strip()
|
|
SCHEME = environ.get('SCHEME', 'http' if 'localhost' in SITE else 'https')
|
|
|
|
if "localhost" in SITE:
|
|
SITE_FULL = 'http://' + SITE
|
|
else:
|
|
SITE_FULL = 'https://' + SITE
|
|
|
|
WELCOME_MSG = (
|
|
f"Welcome to {SITE_TITLE}! Please read [the rules](/rules) first. "
|
|
"Then [read some of our current conversations](/) and feel free to comment "
|
|
"or post!\n"
|
|
"We encourage people to comment even if they aren't sure they fit in; as "
|
|
"long as your comment follows [community rules](/rules), we are happy to "
|
|
"have posters from all backgrounds, education levels, and specialties."
|
|
)
|
|
|
|
SQLALCHEMY_TRACK_MODIFICATIONS = False
|
|
DATABASE_URL = environ.get("DATABASE_URL", "postgresql://postgres@localhost:5432")
|
|
SECRET_KEY = environ.get('MASTER_KEY', '')
|
|
SERVER_NAME = environ.get("DOMAIN").strip()
|
|
SESSION_COOKIE_SECURE = "localhost" not in SERVER_NAME
|
|
DEFAULT_COLOR = environ.get("DEFAULT_COLOR", "fff").strip()
|
|
DEFAULT_TIME_FILTER = environ.get("DEFAULT_TIME_FILTER", "all").strip()
|
|
HCAPTCHA_SITEKEY = environ.get("HCAPTCHA_SITEKEY","").strip()
|
|
HCAPTCHA_SECRET = environ.get("HCAPTCHA_SECRET","").strip()
|
|
|
|
if not SECRET_KEY:
|
|
raise Exception("Secret key not set!")
|
|
|
|
# spam filter
|
|
|
|
SPAM_SIMILARITY_THRESHOLD = float(environ.get("SPAM_SIMILARITY_THRESHOLD", 0.5))
|
|
''' Spam filter similarity threshold (posts) '''
|
|
SPAM_URL_SIMILARITY_THRESHOLD = float(environ.get("SPAM_URL_SIMILARITY_THRESHOLD", 0.1))
|
|
''' Spam filter similarity threshold for URLs (posts) '''
|
|
SPAM_SIMILAR_COUNT_THRESHOLD = int(environ.get("SPAM_SIMILAR_COUNT_THRESHOLD", 10))
|
|
''' Spam filter similarity count (posts) '''
|
|
COMMENT_SPAM_SIMILAR_THRESHOLD = float(environ.get("COMMENT_SPAM_SIMILAR_THRESHOLD", 0.5))
|
|
''' Spam filter similarity threshold (comments)'''
|
|
COMMENT_SPAM_COUNT_THRESHOLD = int(environ.get("COMMENT_SPAM_COUNT_THRESHOLD", 10))
|
|
''' Spam filter similarity count (comments) '''
|
|
|
|
|
|
CACHE_REDIS_URL = environ.get("REDIS_URL", "redis://localhost")
|
|
MAIL_SERVER = environ.get("MAIL_SERVER", "").strip()
|
|
MAIL_PORT = 587
|
|
MAIL_USE_TLS = True
|
|
MAIL_USERNAME = environ.get("MAIL_USERNAME", "").strip()
|
|
MAIL_PASSWORD = environ.get("MAIL_PASSWORD", "").strip()
|
|
DESCRIPTION = environ.get("DESCRIPTION", "DESCRIPTION GOES HERE").strip()
|
|
SQLALCHEMY_DATABASE_URI = DATABASE_URL
|
|
|
|
MENTION_LIMIT = int(environ.get('MENTION_LIMIT', 100))
|
|
''' Maximum amount of username mentions '''
|
|
|
|
MULTIMEDIA_EMBEDDING_ENABLED = bool_from_string(environ.get('MULTIMEDIA_EMBEDDING_ENABLED', False))
|
|
'''
|
|
Whether multimedia will be embedded into a page. Note that this does not
|
|
affect posts or comments retroactively.
|
|
'''
|
|
|
|
RESULTS_PER_PAGE_COMMENTS = int(environ.get('RESULTS_PER_PAGE_COMMENTS', 50))
|
|
SCORE_HIDING_TIME_HOURS = int(environ.get('SCORE_HIDING_TIME_HOURS', 0))
|
|
|
|
|
|
ENABLE_SERVICES = bool_from_string(environ.get('ENABLE_SERVICES', False))
|
|
'''
|
|
Whether to start up deferred tasks. Usually `True` when running as an app and
|
|
`False` when running as a script (for example to perform migrations).
|
|
|
|
See https://github.com/themotte/rDrama/pull/427 for more info.
|
|
'''
|
|
|
|
DBG_VOLUNTEER_PERMISSIVE = bool_from_string(environ.get('DBG_VOLUNTEER_PERMISSIVE', False))
|
|
VOLUNTEER_JANITOR_ENABLE = bool_from_string(environ.get('VOLUNTEER_JANITOR_ENABLE', True))
|
|
|
|
RATE_LIMITER_ENABLED = not bool_from_string(environ.get('DBG_LIMITER_DISABLED', False))
|
|
|
|
ENABLE_DOWNVOTES = not bool_from_string(environ.get('DISABLE_DOWNVOTES', False))
|
|
CARD_VIEW = bool_from_string(environ.get("CARD_VIEW", True))
|
|
FINGERPRINT_TOKEN = environ.get("FP", None)
|
|
|
|
# other stuff from const.py that aren't constants
|
|
CLUB_TRUESCORE_MINIMUM = int(environ.get("DUES").strip())
|
|
|
|
IMGUR_KEY = environ.get("IMGUR_KEY", "").strip()
|
|
PUSHER_ID = environ.get("PUSHER_ID", "").strip()
|
|
PUSHER_KEY = environ.get("PUSHER_KEY", "").strip()
|
|
|
|
YOUTUBE_KEY = environ.get("YOUTUBE_KEY", "").strip()
|
|
|
|
CF_KEY = environ.get("CF_KEY", "").strip()
|
|
CF_ZONE = environ.get("CF_ZONE", "").strip()
|
|
CF_HEADERS = {
|
|
"Authorization": f"Bearer {CF_KEY}",
|
|
"Content-Type": "application/json"
|
|
}
|