Skip to content

D
dymas
Commit d067b323 authored by lixiaofang's avatar lixiaofang
Browse files
Options

doris_dymas

parent 6741ac77
Show whitespace changes
Inline Side-by-side
Showing with 90 additions and 71 deletions
.idea/workspace.xml
View file @ d067b323
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="ae0ff912-332d-4611-9939-a4d235689946" name="Default Changelist" comment="" />
<list default="true" id="ae0ff912-332d-4611-9939-a4d235689946" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app_conf.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app_conf.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/doris/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/__init__.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/doris/base.py" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/base.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/doris/celery.py" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/celery.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/doris/deploy_devel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/deploy_devel.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/doris/devel.py" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/devel.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/doris/doris_injection.py" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/doris_injection.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/doris/log_settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/log_settings.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/doris/routers.py" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/routers.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/doris/system.py" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/system.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/doris/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/urls.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/doris/wsgi.py" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/wsgi.py" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -23,38 +37,40 @@
<entry key="Dockerfile" value="1" />
<entry key="Jenkinsfile" value="1" />
<entry key="gitignore" value="1" />
<entry key="log" value="1" />
<entry key="py" value="27" />
<entry key="log" value="2" />
<entry key="py" value="29" />
<entry key="txt" value="3" />
<entry key="xml" value="1" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="PLAIN_TEXT" value="7" />
<entry key="Python" value="27" />
<entry key="PLAIN_TEXT" value="8" />
<entry key="Python" value="29" />
<entry key="XML" value="1" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="py" value="6" />
<entry key="xml" value="5" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="Python" value="6" />
<entry key="XML" value="5" />
</counts>
</usages-collector>
</session>
</component>
<component name="FileEditorManager">
<leaf>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app_conf.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="435">
<caret line="29" column="44" selection-start-line="29" selection-start-column="44" selection-end-line="29" selection-end-column="44" />
<state relative-caret-position="630">
<caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
</state>
</provider>
</entry>
......@@ -68,19 +84,10 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/doris/base.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-988">
<caret line="23" column="18" selection-start-line="23" selection-end-line="24" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Dockerfile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540">
<state relative-caret-position="333">
<caret line="50" column="24" lean-forward="true" selection-start-line="50" selection-start-column="24" selection-end-line="50" selection-end-column="24" />
</state>
</provider>
......@@ -91,7 +98,7 @@
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/requirements.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
......@@ -100,11 +107,6 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.gm_rpcd.log/doris.gm_logging.GENERAL.log">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
......@@ -115,12 +117,8 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/doris/deploy_devel.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/dymas/base.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
</leaf>
......@@ -167,11 +165,12 @@
<option value="$PROJECT_DIR$/doris/log_settings.py" />
<option value="$PROJECT_DIR$/requirements.txt" />
<option value="$PROJECT_DIR$/doris/base.py" />
<option value="$PROJECT_DIR$/app_conf.xml" />
</list>
</option>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="239" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="-323" />
<option name="y" value="-1080" />
<option name="width" value="1920" />
<option name="height" value="1080" />
......@@ -206,11 +205,6 @@
<item name="dymas" type="b2602c69:ProjectViewProjectNode" />
<item name="dymas" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dymas" type="b2602c69:ProjectViewProjectNode" />
<item name="dymas" type="462c0819:PsiDirectoryNode" />
<item name="doris" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
......@@ -278,7 +272,7 @@
<frame x="-323" y="-1080" width="1920" height="1080" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24170616" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24170616" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info id="DB Browser" order="3" />
......@@ -291,7 +285,7 @@
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="DB Execution Console" order="8" />
<window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.15544042" />
<window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.2373057" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info anchor="bottom" id="Python Console" order="11" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
......@@ -388,6 +382,9 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="466" column="47" selection-start-line="466" selection-start-column="47" selection-end-line="466" selection-end-column="47" />
<folding>
<element signature="e#14036#26953#0" />
</folding>
</state>
</provider>
</entry>
......@@ -465,30 +462,9 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/manage.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="5" column="58" selection-start-line="5" selection-start-column="58" selection-end-line="5" selection-end-column="58" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/doris/base.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-988">
<caret line="23" column="18" selection-start-line="23" selection-end-line="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gm_rpcd.log/doris.gm_logging.GENERAL.log">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/doris/doris_injection.py">
<provider selected="true" editor-type-id="text-editor">
<state>
......@@ -512,9 +488,35 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gm_rpcd.log/gm_rpcd_request.log">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/doris/system.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-74">
<folding>
<element signature="e#0#36#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/manage.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="5" column="58" selection-start-line="5" selection-start-column="58" selection-end-line="5" selection-end-column="58" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/doris/base.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="23" column="18" selection-start-line="23" selection-end-line="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Dockerfile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540">
<state relative-caret-position="333">
<caret line="50" column="24" lean-forward="true" selection-start-line="50" selection-start-column="24" selection-end-line="50" selection-end-column="24" />
</state>
</provider>
......@@ -529,6 +531,23 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dymas/base.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app_conf.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="630">
<caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
......
Dockerfile
View file @ d067b323
......@@ -43,8 +43,8 @@ RUN apk add --no-cache --virtual .build-deps \
&& pip install --no-cache-dir -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com -r /tmp/requirements.txt \
&& mkdir -p /data/log/dymas/app
ENV GM_RPCD_DEPLOY_CONF_PATH="/srv/apps/dymas/doris/deploy_prod.xml" \
DJANGO_SETTINGS_MODULE=doris.prod
ENV GM_RPCD_DEPLOY_CONF_PATH="/srv/apps/dymas/dymas/deploy_prod.xml" \
DJANGO_SETTINGS_MODULE=dymas.prod
COPY . /srv/apps/dymas/
......
app_conf.xml
View file @ d067b323
<?xml version="1.0" encoding="utf-8"?>
<gm_rpcd_config>
<info config_name="app" version="1.0"/>
<config name="application_name" value="doris"/>
<config name="application_name" value="dymas"/>
<config name="service_list">
<element value="doris"/>
<element value="dymas"/>
</config>
<config name="initializer_list">
<element value="doris.doris_injection"/>
<element value="dymas.doris_injection"/>
<element value="rank.views.strategy"/>
<element value="rank.views.interpose"/>
<element value="rank.views.stat"/>
......@@ -37,6 +37,6 @@
<element value="search.views.content_aggre"/>
<element value="search.views.relation_search"/>
</config>
<config name="statuses" value="doris.system:statuses"/>
<config name="statuses" value="dymas.system:statuses"/>
</gm_rpcd_config>
doris/devel.py → dymas/devel.py
View file @ d067b323
# coding=utf-8
from doris.base import *
from dymas.base import *
from .log_settings import *
from celery import *
......
doris/system.py → dymas/system.py
View file @ d067b323
......@@ -2,7 +2,7 @@ from django.http import HttpResponse
from libs.es import health
from rank.models import Strategy
from libs.cache import redis_client
from doris.celery import debug_task
from dymas.celery import debug_task
import json, traceback
......
doris/urls.py → dymas/urls.py
View file @ d067b323
......@@ -17,7 +17,7 @@ import json
from django.conf.urls import url, include
from django.contrib import admin
from libs.http import render_json
from doris.system import statuses
from dymas.system import statuses
http_statuses = render_json(statuses)
......
manage.py
View file @ d067b323
......@@ -3,7 +3,7 @@ import os
import sys
if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "doris.devel")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dymas.devel")
try:
from django.core.management import execute_from_command_line
except ImportError:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment