add online settings

diff --git a/client/post-example/results.json b/client/post-example/results.json
index 19074cca1ba45533c30f33cd3098abdf6ae24f5b..8efee14ec8afdee86bcf172e2ea9511c865c84df 100644 (file)
--- a/client/post-example/results.json
+++ b/client/post-example/results.json
@@ -4,7 +4,7 @@
             "10": {
                 "1": {
                     "std": 397.30643899999995, 
-                    "metric": 22442.645435, 
+                    "metric": 28642.645435, 
                     "median": 11892.645435, 
                     "results": [
                         {
@@ -37,7 +37,7 @@
                 }, 
                 "2": {
                     "std": 252.71243850000064, 
-                    "metric": 30183.186513499997, 
+                    "metric": 32093.186513499997, 
                     "median": 28953.186513499997, 
                     "results": [
                         {
@@ -70,7 +70,7 @@
                 }, 
                 "4": {
                     "std": 285.0294699999995, 
-                    "metric": 22215.454019999997, 
+                    "metric": 18215.454019999997, 
                     "median": 28795.454019999997, 
                     "results": [
                         {
@@ -107,7 +107,7 @@
             "10": {
                 "1": {
                     "std": 86.91589850000001, 
-                    "metric": 3211.6329775, 
+                    "metric": 4131.6329775, 
                     "median": 150.6329775, 
                     "results": [
                         {
@@ -140,7 +140,7 @@
                 }, 
                 "2": {
                     "std": 4.182392499999992, 
-                    "metric": 220.8884175, 
+                    "metric": 420.8884175, 
                     "median": 280.8884175, 
                     "results": [
                         {
@@ -173,7 +173,7 @@
                 }, 
                 "4": {
                     "std": 15.571989000000002, 
-                    "metric": 1090.858649, 
+                    "metric": 1180.858649, 
                     "median": 399.858649, 
                     "results": [
                         {

diff --git a/client/post-example/update.py b/client/post-example/upload.py
similarity index 87%
rename from client/post-example/update.py
rename to client/post-example/upload.py
index f889dea842b0ca285b421ce1e67b0c53e220c0c1..2bd783e9e04b66e44f9f3684c78777b0a0f6d5d6 100644 (file)
--- a/client/post-example/update.py
+++ b/client/post-example/upload.py
@@ -14,8 +14,9 @@ def byteify(input):
         return input
 
 
-token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJ1bmlxdWVfbmFtZSI6I..........'
-BASE_URL = 'http://127.0.0.1:8000/'
+token = 'fake token'
+BASE_URL = 'http://140.211.168.111:8080/'
+#BASE_URL = 'http://127.0.0.1:8000/'
 PATH_URL = 'upload/'
 url = BASE_URL + PATH_URL
 

diff --git a/web/apps/test_records/models.py b/web/apps/test_records/models.py
index 53b040a87d0775359269deda9b485df8c1786878..9b3e278ffe37a3e288407d8c67eeb57b9980e55d 100644 (file)
--- a/web/apps/test_records/models.py
+++ b/web/apps/test_records/models.py
@@ -222,9 +222,10 @@ class TestResult(models.Model):
     threads = models.IntegerField(verbose_name="threads", help_text="threads of the test result")
 
     MODE_CHOICE = (
-        (1, 'simple'),
+        ('simple', 'simple'),
+        ('other', 'other'),
     )
-    mode = models.IntegerField(choices=MODE_CHOICE, verbose_name="mode", help_text="test mode")
+    mode = models.IntegerField(choices=MODE_CHOICE, default='simple', verbose_name="mode", help_text="test mode")
     add_time = models.DateTimeField(default=timezone.now, verbose_name="test result added time")
 
     class Meta:

diff --git a/web/db_tools/import_alias_data.py b/web/db_tools/import_alias_data.py
index d347f347933a3ee09d6022599340f2305dffd71e..f9cb10370f0fc1aac68218b908e58e20c3d92306 100644 (file)
--- a/web/db_tools/import_alias_data.py
+++ b/web/db_tools/import_alias_data.py
@@ -4,7 +4,8 @@ import os
 # Use django's model independently
 pwd = os.path.dirname(os.path.realpath(__file__))
 sys.path.append(pwd)
-path = 'D:\GitSpace\pgperffarm\web\pgperffarm'
+path = '/var/www/web/pgperffarm'
+# path = 'D:\GitSpace\pgperffarm\web\pgperffarm'
 sys.path.append(path)
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
 

diff --git a/web/db_tools/import_branch_data.py b/web/db_tools/import_branch_data.py
index d6432727cf67bebd79112daf0fbc60b77f145658..aeabae4cf0475a6beb96b92f3aa22fd1dde178c9 100644 (file)
--- a/web/db_tools/import_branch_data.py
+++ b/web/db_tools/import_branch_data.py
@@ -4,7 +4,8 @@ import os
 # Use django's model independently
 pwd = os.path.dirname(os.path.realpath(__file__))
 sys.path.append(pwd)
-path = 'D:\GitSpace\pgperffarm\web\pgperffarm'
+path = '/var/www/web/pgperffarm'
+# path = 'D:\GitSpace\pgperffarm\web\pgperffarm'
 sys.path.append(path)
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
 

diff --git a/web/db_tools/import_category_data.py b/web/db_tools/import_category_data.py
index 4c677e1f12f3eefa31bd2f9aa18c5ecf76d75f8c..458570d2a656b329e28733035de8b1b995af6a80 100644 (file)
--- a/web/db_tools/import_category_data.py
+++ b/web/db_tools/import_category_data.py
@@ -4,7 +4,8 @@ import os
 # Use django's model independently
 pwd = os.path.dirname(os.path.realpath(__file__))
 sys.path.append(pwd+ "../")
-path = 'D:\GitSpace\pgperffarm\web\pgperffarm'
+path = '/var/www/web/pgperffarm'
+# path = 'D:\GitSpace\pgperffarm\web\pgperffarm'
 sys.path.append(path)
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
 

diff --git a/web/db_tools/import_machine_data.py b/web/db_tools/import_machine_data.py
index 1b518d687ff142ef8dc3580163c2cf2e4f59272b..f7f2bdc454dc3ba20c4f14f83f73604fb3c6fd31 100644 (file)
--- a/web/db_tools/import_machine_data.py
+++ b/web/db_tools/import_machine_data.py
@@ -4,7 +4,8 @@ import os
 # Use django's model independently
 pwd = os.path.dirname(os.path.realpath(__file__))
 sys.path.append(pwd+ "../")
-path = 'D:\GitSpace\pgperffarm\web\pgperffarm'
+path = '/var/www/web/pgperffarm'
+# path = 'D:\GitSpace\pgperffarm\web\pgperffarm'
 sys.path.append(path)
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
 

diff --git a/web/db_tools/import_user_data.py b/web/db_tools/import_user_data.py
index ee83e1626b1dd15942b234eb342058a92f37afdd..e336102748b5e89ddba67ea9bb68b4e20a8785c8 100644 (file)
--- a/web/db_tools/import_user_data.py
+++ b/web/db_tools/import_user_data.py
@@ -4,7 +4,8 @@ import os
 # Use django's model independently
 pwd = os.path.dirname(os.path.realpath(__file__))
 sys.path.append(pwd+ "../")
-path = 'D:\GitSpace\pgperffarm\web\pgperffarm'
+path = '/var/www/web/pgperffarm'
+# path = 'D:\GitSpace\pgperffarm\web\pgperffarm'
 sys.path.append(path)
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
 

diff --git a/web/pgperffarm/settings.py b/web/pgperffarm/settings.py
index 15e89deecd2ae57884975574fb5d6288b8a9926d..ed73111fe3b74c52c13f897c718d15ae98c90f25 100644 (file)
--- a/web/pgperffarm/settings.py
+++ b/web/pgperffarm/settings.py
@@ -142,8 +142,8 @@ REST_FRAMEWORK = {
 
 DB_ENUM = {
     "mode":{
-        "simple":1,
-        "other":2
+        "simple":'simple',
+        "other":'other'
     },
     "status": {
         "none": -1,
@@ -184,4 +184,5 @@ CORS_ALLOW_HEADERS = (
     'x-csrftoken',
     'x-requested-with',
     'Pragma',
-)
\ No newline at end of file
+)
+ALLOWED_HOSTS = ['*']
\ No newline at end of file

diff --git a/web/requirements.txt b/web/requirements.txt
index fb6d2ff65fa89bf89efad35e02638076c40e959d..2456e78499bdce928016b29c194f164664b868a3 100644 (file)
--- a/web/requirements.txt
+++ b/web/requirements.txt
@@ -1,8 +1,28 @@
+certifi==2018.4.16
+chardet==3.0.4
+codegen==1.0
+coreapi==2.3.3
+coreschema==0.0.4
+data==0.4
+decorator==4.3.0
 Django==1.11.10
-django-gravatar2==1.4.0
-pycrypto==2.6.1
-psycopg2==2.7.4
+django-cors-headers==2.2.0
+django-crispy-forms==1.7.2
 django-filter==1.1.0
+django-formtools==2.1
+django-gravatar2==1.4.0
 djangorestframework==3.8.1
+funcsigs==1.0.2
+idna==2.6
+itypes==1.1.0
+Jinja2==2.10
 Markdown==2.6.11
+MarkupSafe==1.0
+psycopg2==2.7.4
+pycrypto==2.6.1
 pytz==2018.3
+requests==2.18.4
+shortuuid==0.5.0
+six==1.11.0
+uritemplate==3.0.0
+urllib3==1.22

diff --git a/web/requirements.txt.bak b/web/requirements.txt.bak
new file mode 100644 (file)
index 0000000..fb6d2ff
--- /dev/null
+++ b/web/requirements.txt.bak
@@ -0,0 +1,8 @@
+Django==1.11.10
+django-gravatar2==1.4.0
+pycrypto==2.6.1
+psycopg2==2.7.4
+django-filter==1.1.0
+djangorestframework==3.8.1
+Markdown==2.6.11
+pytz==2018.3

diff --git a/web/uwsgi.ini b/web/uwsgi.ini
new file mode 100644 (file)
index 0000000..8155200
--- /dev/null
+++ b/web/uwsgi.ini
@@ -0,0 +1,23 @@
+[uwsgi]
+# Django-related settings
+# socket=/opt/proj/script/uwsgi.sock
+
+# the base directory (full path)
+chdir = /var/www/web
+
+# Django s wsgi file
+module = pgperffarm.wsgi
+
+# process-related settings
+# master
+master = true
+
+# maximum number of worker processes
+processes = 4
+
+# ... with appropriate permissions - may be needed
+# chmod-socket = 664
+# clear environment on exit
+vacuum = true
+http=0.0.0.0:8080
+# pythonpath = /home/debian/env/pg_perf_farm2/lib/python2.7/site-packages
\ No newline at end of file