modify server name
diff --git a/book/vbook.py b/book/vbook.py
index 08d1ce3..3d52f4f 100644
--- a/book/vbook.py
+++ b/book/vbook.py
@@ -12,8 +12,8 @@
import datetime
import logging
import sys
-logger = logging.getLogger(__name__)
-#logger = logging.getLogger("mysite")
+#logger = logging.getLogger(__name__)
+logger = logging.getLogger("mysite")
'''
function: get current time
diff --git a/book/views.py b/book/views.py
index 6051826..51a19ce 100755
--- a/book/views.py
+++ b/book/views.py
@@ -8,7 +8,7 @@
from book.Util.tasks import *
#from book.Util.pushTask import *
from book.Util.util import *
-from bookStore import celery_app
+from vHomeLibraryServer import celery_app
import simplejson
import random
import datetime
@@ -19,7 +19,7 @@
#logger = logging.getLogger(__name__)
'''
set log output to console or file
-modify the bookStore/setting.py
+modify the vHomeLibraryServer/setting.py
'''
logger = logging.getLogger("mysite")
diff --git a/bookStore/settings.py_console b/bookStore/settings.py_console
deleted file mode 100755
index bfae03a..0000000
--- a/bookStore/settings.py_console
+++ /dev/null
@@ -1,192 +0,0 @@
-"""
-Django settings for bookStore project.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/1.6/topics/settings/
-
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/1.6/ref/settings/
-"""
-
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-import os, sys
-BASE_DIR = os.path.dirname(os.path.dirname(__file__))
-
-
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/
-
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 'q=lnza4m*oa-jgsp_id8ja$or2fbzdli48u35orc@0p56r8lzn'
-
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
-
-TEMPLATE_DEBUG = True
-
-ALLOWED_HOSTS = []
-
-
-# Application definition
-
-INSTALLED_APPS = (
- 'django.contrib.admin',
- 'django.contrib.auth',
- 'django.contrib.contenttypes',
- 'django.contrib.sessions',
- 'django.contrib.messages',
- 'django.contrib.staticfiles',
-#'online',
-# 'management',
- 'book',
-)
-
-MIDDLEWARE_CLASSES = (
- 'django.contrib.sessions.middleware.SessionMiddleware',
- 'django.middleware.common.CommonMiddleware',
-# 'django.middleware.csrf.CsrfViewMiddleware',
- 'django.contrib.auth.middleware.AuthenticationMiddleware',
- 'django.contrib.messages.middleware.MessageMiddleware',
- 'django.middleware.clickjacking.XFrameOptionsMiddleware',
-)
-
-CACHE_BACKEND = 'memcached://127.0.0.1:11211/'
-
-ROOT_URLCONF = 'bookStore.urls'
-
-WSGI_APPLICATION = 'bookStore.wsgi.application'
-
-
-# Database
-# https://docs.djangoproject.com/en/1.6/ref/settings/#databases
-
-DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
- }
-}
-
-# Internationalization
-# https://docs.djangoproject.com/en/1.6/topics/i18n/
-
-LANGUAGE_CODE = 'en-us'
-
-TIME_ZONE = 'UTC'
-
-USE_I18N = True
-
-USE_L10N = True
-
-USE_TZ = True
-
-
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.6/howto/static-files/
-
-STATIC_URL = '/static/'
-
-#template
-#TEMPLATE_DIRS=(
-# '/home/ysk/openSource/summer_camp/deploy/bookStore/book/templates'
-#)
-
-# A data structure containing configuration information.
-# The contents of this data structure will be passed as the argument to
-# the configuration method described in LOGGING_CONFIG.
-'''
-LOGGING = {
- 'version': 1,
- 'disable_existing_loggers': False,
- 'formatters': {
- 'verbose': {
- 'format' : "[%(asctime)s] %(levelname)s [%(name)s:%(lineno)s] %(message)s",
- 'datefmt' : "%d/%b/%Y %H:%M:%S"
- },
- 'simple': {
- 'format': '%(levelname)s %(message)s'
- },
- },
- 'filters': {
- 'require_debug_false': {
- '()': 'django.utils.log.RequireDebugFalse'
- }
- },
- 'handlers': {
- 'file':{
- 'level': 'DEBUG',
- 'class': 'logging.FileHandler',
- 'filename': 'mysite.log',
- 'formatter': 'verbose'
- },
- 'console': {
- 'level': 'INFO',
- 'filters': ['require_debug_false'],
- 'class': 'logging.StreamHandler',
- 'formatter': 'simple'
- },
- 'mail_admins': {
- 'level': 'ERROR',
- 'class': 'django.utils.log.AdminEmailHandler',
- }
- },
- 'loggers': {
-# 'django': {
-# 'handlers':['file'],
-# 'propagate': True,
-# 'level':'DEBUG',
-# },
-# 'console': {
-# 'book.views':{
-# 'handlers': ['console'],
-# 'level': 'DEBUG',
-# Log messages written to django.request will not be handled by the django logger.
-# 'propagate': False,
-# }
-# },
- '': {
- 'handlers': ['console'],
- 'level': 'NOTSET',
- },
- 'django.request': {
- 'handlers': ['console'],
- 'propagate': False,
- 'level': 'DEBUG'
- },
-# 'mysite': {
-# 'handlers': ['file'],
-# 'level': 'DEBUG',
-# },
- }
-}
-
-'''
-LOGGING = {
- 'version': 1,
- 'disable_existing_loggers': True,
- 'formatters': {
- 'verbose': {
-# 'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s'
- 'format' : "[%(asctime)s] [%(name)s:%(funcName)s:%(lineno)s] [%(levelname)s]: %(message)s",
- 'datefmt' : "%d/%b/%Y %H:%M:%S"
- },
- },
- 'handlers': {
- 'console': {
- 'level': 'NOTSET',
- 'class': 'logging.StreamHandler',
- 'formatter': 'verbose'
- }
- },
- 'loggers': {
- '': {
- 'handlers': ['console'],
- 'level': 'INFO',
- },
- 'django.request': {
- 'handlers': ['console'],
- 'propagate': False,
- 'level': 'ERROR'
- }
- }
-}
diff --git a/db.sqlite3 b/db.sqlite3
index 47003ec..9088beb 100644
--- a/db.sqlite3
+++ b/db.sqlite3
Binary files differ
diff --git a/manage.py b/manage.py
index 46a71c0..84d8a54 100755
--- a/manage.py
+++ b/manage.py
@@ -3,7 +3,7 @@
import sys
if __name__ == "__main__":
- os.environ.setdefault("DJANGO_SETTINGS_MODULE", "bookStore.settings")
+ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "vHomeLibraryServer.settings")
from django.core.management import execute_from_command_line
diff --git a/bookStore/__init__.py b/vHomeLibraryServer/__init__.py
similarity index 100%
rename from bookStore/__init__.py
rename to vHomeLibraryServer/__init__.py
diff --git a/bookStore/celery.py b/vHomeLibraryServer/celery.py
similarity index 88%
rename from bookStore/celery.py
rename to vHomeLibraryServer/celery.py
index bc32cb0..abc689b 100644
--- a/bookStore/celery.py
+++ b/vHomeLibraryServer/celery.py
@@ -5,11 +5,11 @@
from celery import Celery
# set the default Django settings module for the 'celery' program.
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'bookStore.settings')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'vHomeLibraryServer.settings')
from django.conf import settings # noqa
-app = Celery('bookStore',
+app = Celery('vHomeLibraryServer',
broker = 'redis://localhost',
backend = 'redis://localhost',
)
diff --git a/bookStore/settings.py b/vHomeLibraryServer/settings.py
similarity index 95%
rename from bookStore/settings.py
rename to vHomeLibraryServer/settings.py
index c998558..4802ce5 100755
--- a/bookStore/settings.py
+++ b/vHomeLibraryServer/settings.py
@@ -1,5 +1,5 @@
"""
-Django settings for bookStore project.
+Django settings for vHomeLibraryServer project.
For more information on this file, see
https://docs.djangoproject.com/en/1.6/topics/settings/
@@ -51,9 +51,9 @@
'django.middleware.clickjacking.XFrameOptionsMiddleware',
)
-ROOT_URLCONF = 'bookStore.urls'
+ROOT_URLCONF = 'vHomeLibraryServer.urls'
-WSGI_APPLICATION = 'bookStore.wsgi.application'
+WSGI_APPLICATION = 'vHomeLibraryServer.wsgi.application'
# Database
@@ -87,7 +87,7 @@
#template
#TEMPLATE_DIRS=(
-# '/home/ysk/openSource/summer_camp/deploy/bookStore/book/templates'
+# '/home/ysk/openSource/summer_camp/deploy/vHomeLibraryServer/book/templates'
#)
# A data structure containing configuration information.
@@ -239,7 +239,7 @@
'propagate': False,
},
'mysite': {
- 'handlers': ['console'],
+ 'handlers': ['file'],
'level': 'INFO',
},
}
diff --git a/bookStore/urls.py b/vHomeLibraryServer/urls.py
similarity index 87%
rename from bookStore/urls.py
rename to vHomeLibraryServer/urls.py
index 0efb97c..ee6b14f 100755
--- a/bookStore/urls.py
+++ b/vHomeLibraryServer/urls.py
@@ -6,7 +6,7 @@
urlpatterns = patterns('',
# Examples:
- # url(r'^$', 'bookStore.views.home', name='home'),
+ # url(r'^$', 'vHomeLibraryServer.views.home', name='home'),
# url(r'^blog/', include('blog.urls')),
url(r'^book/', include('book.urls')),
diff --git a/bookStore/wsgi.py b/vHomeLibraryServer/wsgi.py
similarity index 69%
rename from bookStore/wsgi.py
rename to vHomeLibraryServer/wsgi.py
index b717df5..9486781 100755
--- a/bookStore/wsgi.py
+++ b/vHomeLibraryServer/wsgi.py
@@ -1,5 +1,5 @@
"""
-WSGI config for bookStore project.
+WSGI config for vHomeLibraryServer project.
It exposes the WSGI callable as a module-level variable named ``application``.
@@ -8,7 +8,7 @@
"""
import os
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "bookStore.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "vHomeLibraryServer.settings")
from django.core.wsgi import get_wsgi_application
application = get_wsgi_application()