-
Notifications
You must be signed in to change notification settings - Fork 80
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
make help email address configurable instead of hard coding #3384
Changes from 4 commits
57d1b14
13eafdf
55f2a6b
cae7fc7
fd0e9f7
4cc57ae
b2eb8f0
daddfc2
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -117,6 +117,12 @@ class ConfigurationManager(object): | |
The script used to start the plugins | ||
plugin_dir : str | ||
The path to the directory containing the plugin configuration files | ||
help_email : str | ||
The email address a user should write to when asking for help | ||
Defaults to qiita.help@gmail.com | ||
sysadmin_email : str | ||
antgonza marked this conversation as resolved.
Show resolved
Hide resolved
|
||
The email address, Qiita sends internal notifications to a sys admin | ||
Defaults to jdereus@health.ucsd.edu | ||
|
||
Raises | ||
------ | ||
|
@@ -234,6 +240,14 @@ def _get_main(self, config): | |
self.key_file = join(install_dir, 'qiita_core', 'support_files', | ||
'ci_server.key') | ||
|
||
self.help_email = config.get('main', 'HELP_EMAIL') | ||
if not self.help_email: | ||
self.help_email = 'qiita.help@gmail.com' | ||
|
||
self.sysadmin_email = config.get('main', 'SYSADMIN_EMAIL') | ||
if not self.sysadmin_email: | ||
self.sysadmin_email = 'jdereus@health.ucsd.edu' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm on the fence about this being better than actually raising an error if those are not defined; what do you think? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. agree! Thus, we remove "personalized" emails completely. What type of error do you suggest? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I guess something like: There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done. I was wondering about the class of the error, not the message ;-) Sorry for being unspecific. |
||
|
||
def _get_job_scheduler(self, config): | ||
"""Get the configuration of the job_scheduler section""" | ||
self.job_scheduler_owner = config.get( | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is no longer true, right? Could you remove this and the one below?