Skip to content

safemode=True by default and configchange logging #87

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
May 19, 2015
Merged

safemode=True by default and configchange logging #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion datajoint/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#
'loglevel': 'DEBUG',
#
'safemode': False,
'safemode': True,
#
'display.limit': 7,
'display.width': 14
Expand Down Expand Up @@ -78,6 +78,7 @@ def __getitem__(self, key):
return self._conf[key]

def __setitem__(self, key, value):
logger.log(logging.INFO, u"Setting {0:s} to {1:s}".format(str(key), str(value)))
if isinstance(value, collections.Mapping):
raise ValueError("Nested settings are not supported!")
if validators[key](value):
Expand Down
3 changes: 2 additions & 1 deletion tests/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import pymysql
import logging
from os import environ
import datajoint as dj

logging.basicConfig(level=logging.DEBUG)

Expand All @@ -26,7 +27,7 @@

def setup():
cleanup()

dj.config['safemode'] = False

def teardown():
cleanup()
Expand Down
6 changes: 3 additions & 3 deletions tests/schemata/schema1/test1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class Trials(dj.Relation):
outcome : int # result of experiment

notes="" : varchar(4096) # other comments
trial_ts=CURRENT_TIMESTAMP : timestamp # automatic
trial_ts=CURRENT_TIMESTAMP : timestamp # automatic
"""


Expand All @@ -47,7 +47,7 @@ class Experiments(dj.Relation):
definition = """
test1.Experiments (imported) # Experiment info
-> test1.Subjects
exp_id : int # unique id for experiment
exp_id : int # unique id for experiment
---
exp_data_file : varchar(255) # data file
"""
Expand All @@ -59,7 +59,7 @@ class Sessions(dj.Relation):
test1.Sessions (manual) # Experiment sessions
-> test1.Subjects
-> test2.Experimenter
session_id : int # unique session id
session_id : int # unique session id
---
session_comment : varchar(255) # comment about the session
"""
Expand Down