counterweight/drogon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mas correciones menores para testing.

Browse source
This commit is contained in:
pablomartincalvo 2018-11-02 19:21:52 +01:00
parent 906d8b5cd9
commit 94b604997c
4 changed files with 245 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

462
.idea/workspace.xml generated
View file

@ -2,16 +2,10 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="6e2fbba0-85ff-42d6-8e70-e4cdef1000c8" name="Default Changelist" comment="preparado para empezar pruebas del deployer."> <list default="true" id="6e2fbba0-85ff-42d6-8e70-e4cdef1000c8" name="Default Changelist" comment="preparado para empezar pruebas del deployer.">
<change afterPath="$PROJECT_DIR$/core/config.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/db_layer/db_init_scripts/1_20181028dump.sql" afterDir="false" />
<change afterPath="$PROJECT_DIR$/db_layer/db_init_scripts/2_users.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/core/config.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/config.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/core/mysql_wrapper.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/mysql_wrapper.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/core/mysql_wrapper.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/mysql_wrapper.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/db_layer/db_init_scripts/users.sql" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/deployer.sh" beforeDir="false" afterPath="$PROJECT_DIR$/deployer.sh" afterDir="false" /> <change beforePath="$PROJECT_DIR$/deployer.sh" beforeDir="false" afterPath="$PROJECT_DIR$/deployer.sh" afterDir="false" />
<change beforePath="$PROJECT_DIR$/explorer/explorer.py" beforeDir="false" afterPath="$PROJECT_DIR$/explorer/explorer.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/geocoder/geocoder.py" beforeDir="false" afterPath="$PROJECT_DIR$/geocoder/geocoder.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/requirements.txt" beforeDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@ -38,21 +32,21 @@
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.open"> <usages-collector id="statistics.file.extensions.open">
<counts> <counts>
<entry key="Dockerfile" value="8" /> <entry key="Dockerfile" value="10" />
<entry key="py" value="90" /> <entry key="py" value="109" />
<entry key="sh" value="4" /> <entry key="sh" value="6" />
<entry key="sql" value="5" /> <entry key="sql" value="5" />
<entry key="txt" value="6" /> <entry key="txt" value="6" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.open"> <usages-collector id="statistics.file.types.open">
<counts> <counts>
<entry key="Bash" value="2" /> <entry key="Bash" value="4" />
<entry key="DBN-SQL" value="2" /> <entry key="DBN-SQL" value="2" />
<entry key="PLAIN_TEXT" value="16" /> <entry key="PLAIN_TEXT" value="18" />
<entry key="Python" value="85" /> <entry key="Python" value="103" />
<entry key="SQL" value="3" /> <entry key="SQL" value="3" />
<entry key="Scratch" value="5" /> <entry key="Scratch" value="6" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.edit"> <usages-collector id="statistics.file.extensions.edit">
@ -61,25 +55,25 @@
<entry key="Python Console" value="1621" /> <entry key="Python Console" value="1621" />
<entry key="capturer" value="862" /> <entry key="capturer" value="862" />
<entry key="dummy" value="14" /> <entry key="dummy" value="14" />
<entry key="py" value="19356" /> <entry key="py" value="19402" />
<entry key="scratch_1" value="489" /> <entry key="scratch_1" value="489" />
<entry key="sh" value="1609" /> <entry key="sh" value="1633" />
<entry key="sql" value="53" /> <entry key="sql" value="53" />
<entry key="txt" value="1257" /> <entry key="txt" value="1257" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.edit"> <usages-collector id="statistics.file.types.edit">
<counts> <counts>
<entry key="Bash" value="430" /> <entry key="Bash" value="454" />
<entry key="DBN-SQL" value="53" /> <entry key="DBN-SQL" value="53" />
<entry key="PLAIN_TEXT" value="2559" /> <entry key="PLAIN_TEXT" value="2559" />
<entry key="Python" value="22056" /> <entry key="Python" value="22102" />
<entry key="Scratch" value="272" /> <entry key="Scratch" value="272" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.vcs.git.usages"> <usages-collector id="statistics.vcs.git.usages">
<counts> <counts>
<entry key="git.branch.checkout.local" value="2" /> <entry key="git.branch.checkout.local" value="4" />
<entry key="git.branch.create.new" value="1" /> <entry key="git.branch.create.new" value="1" />
</counts> </counts>
</usages-collector> </usages-collector>
@ -89,74 +83,121 @@
<favorites_list name="Drogon" /> <favorites_list name="Drogon" />
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <splitter split-orientation="horizontal" split-proportion="0.5">
<file pinned="false" current-in-tab="true"> <split-first>
<entry file="file://$PROJECT_DIR$/deployer.sh"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<provider selected="true" editor-type-id="text-editor"> <file pinned="false" current-in-tab="false">
<state relative-caret-position="330"> <entry file="file://$PROJECT_DIR$/db_layer/Dockerfile">
<caret line="76" selection-start-line="76" selection-end-line="76" selection-end-column="29" /> <provider selected="true" editor-type-id="text-editor">
</state> <state relative-caret-position="60">
</provider> <caret line="4" selection-start-line="4" selection-end-line="4" />
</entry> </state>
</file> </provider>
<file pinned="false" current-in-tab="false"> </entry>
<entry file="file://$PROJECT_DIR$/db_layer/Dockerfile"> </file>
<provider selected="true" editor-type-id="text-editor"> <file pinned="false" current-in-tab="false">
<state relative-caret-position="60"> <entry file="file://$PROJECT_DIR$/deployer.sh">
<caret line="4" column="51" selection-start-line="4" selection-start-column="51" selection-end-line="4" selection-end-column="51" /> <provider selected="true" editor-type-id="text-editor">
</state> <state relative-caret-position="795">
</provider> <caret line="80" column="50" lean-forward="true" selection-start-line="80" selection-start-column="50" selection-end-line="80" selection-end-column="50" />
</entry> </state>
</file> </provider>
<file pinned="false" current-in-tab="false"> </entry>
<entry file="file://$PROJECT_DIR$/core/config.py"> </file>
<provider selected="true" editor-type-id="text-editor"> <file pinned="false" current-in-tab="true">
<state relative-caret-position="405"> <entry file="file://$PROJECT_DIR$/core/config.py">
<caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" /> <provider selected="true" editor-type-id="text-editor">
<folding> <state relative-caret-position="180">
<element signature="e#0#22#0" expanded="true" /> <caret line="12" column="33" selection-start-line="12" selection-start-column="33" selection-end-line="12" selection-end-column="33" />
</folding> <folding>
</state> <element signature="e#0#22#0" expanded="true" />
</provider> </folding>
</entry> </state>
</file> </provider>
<file pinned="false" current-in-tab="false"> </entry>
<entry file="file://$PROJECT_DIR$/explorer/explorer.py"> </file>
<provider selected="true" editor-type-id="text-editor"> <file pinned="false" current-in-tab="false">
<state relative-caret-position="165"> <entry file="file://$PROJECT_DIR$/db_layer/capturas_interface.py">
<caret line="95" column="88" selection-start-line="95" selection-start-column="88" selection-end-line="95" selection-end-column="88" /> <provider selected="true" editor-type-id="text-editor">
</state> <state relative-caret-position="1200">
</provider> <caret line="80" column="39" selection-start-line="80" selection-start-column="39" selection-end-line="80" selection-end-column="39" />
</entry> </state>
</file> </provider>
<file pinned="false" current-in-tab="false"> </entry>
<entry file="file://$PROJECT_DIR$/capturer/capturer.py"> </file>
<provider selected="true" editor-type-id="text-editor"> </leaf>
<state relative-caret-position="240"> </split-first>
<caret line="26" column="34" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" /> <split-second>
</state> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
</provider> <file pinned="false" current-in-tab="false">
</entry> <entry file="file://$PROJECT_DIR$/explorer/explorer.py">
</file> <provider selected="true" editor-type-id="text-editor">
<file pinned="false" current-in-tab="false"> <state relative-caret-position="4215">
<entry file="file://$PROJECT_DIR$/core/mysql_wrapper.py"> <caret line="281" selection-start-line="281" selection-end-line="281" />
<provider selected="true" editor-type-id="text-editor"> </state>
<state relative-caret-position="135"> </provider>
<caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" /> </entry>
</state> </file>
</provider> <file pinned="false" current-in-tab="false">
</entry> <entry file="file://$PROJECT_DIR$/tests/capturer_tests.py">
</file> <provider selected="true" editor-type-id="text-editor">
<file pinned="false" current-in-tab="false"> <state relative-caret-position="255">
<entry file="file://$PROJECT_DIR$/geocoder/geocoder.py"> <caret line="17" selection-start-line="17" selection-end-line="17" />
<provider selected="true" editor-type-id="text-editor"> </state>
<state relative-caret-position="1950"> </provider>
<caret line="130" column="22" lean-forward="true" selection-start-line="130" selection-start-column="22" selection-end-line="130" selection-end-column="22" /> </entry>
</state> </file>
</provider> <file pinned="false" current-in-tab="false">
</entry> <entry file="file://$PROJECT_DIR$/db_layer/capturing_tasks_interface.py">
</file> <provider selected="true" editor-type-id="text-editor">
</leaf> <state relative-caret-position="15">
<caret line="1" selection-start-line="1" selection-end-line="1" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/refresher/refresher.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405">
<caret line="27" column="27" selection-start-line="27" selection-start-column="27" selection-end-line="27" selection-end-column="27" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/core/mysql_wrapper.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
<caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/core/alerts.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="7" column="34" selection-start-line="7" selection-start-column="34" selection-end-line="7" selection-end-column="34" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file:///usr/lib/python3/dist-packages/apport_python_hook.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="173">
<caret line="46" selection-start-line="46" selection-end-line="46" />
</state>
</provider>
</entry>
</file>
</leaf>
</split-second>
</splitter>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES"> <option name="RECENT_TEMPLATES">
@ -186,7 +227,7 @@
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
<option name="RECENT_BRANCH_BY_REPOSITORY"> <option name="RECENT_BRANCH_BY_REPOSITORY">
<map> <map>
<entry key="$PROJECT_DIR$" value="testing" /> <entry key="$PROJECT_DIR$" value="dev" />
</map> </map>
</option> </option>
</component> </component>
@ -215,12 +256,12 @@
<option value="$PROJECT_DIR$/capturer/Dockerfile" /> <option value="$PROJECT_DIR$/capturer/Dockerfile" />
<option value="$PROJECT_DIR$/geocoder/Dockerfile" /> <option value="$PROJECT_DIR$/geocoder/Dockerfile" />
<option value="$PROJECT_DIR$/refresher/Dockerfile" /> <option value="$PROJECT_DIR$/refresher/Dockerfile" />
<option value="$PROJECT_DIR$/core/config.py" />
<option value="$PROJECT_DIR$/core/mysql_wrapper.py" />
<option value="$PROJECT_DIR$/geocoder/geocoder.py" /> <option value="$PROJECT_DIR$/geocoder/geocoder.py" />
<option value="$PROJECT_DIR$/explorer/explorer.py" /> <option value="$PROJECT_DIR$/explorer/explorer.py" />
<option value="$PROJECT_DIR$/db_layer/db_init_scripts/users.sql" /> <option value="$PROJECT_DIR$/db_layer/db_init_scripts/users.sql" />
<option value="$PROJECT_DIR$/deployer.sh" /> <option value="$PROJECT_DIR$/deployer.sh" />
<option value="$PROJECT_DIR$/core/mysql_wrapper.py" />
<option value="$PROJECT_DIR$/core/config.py" />
</list> </list>
</option> </option>
</component> </component>
@ -234,6 +275,7 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
@ -241,37 +283,11 @@
<item name="Drogon" type="b2602c69:ProjectViewProjectNode" /> <item name="Drogon" type="b2602c69:ProjectViewProjectNode" />
<item name="Drogon" type="462c0819:PsiDirectoryNode" /> <item name="Drogon" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="Drogon" type="b2602c69:ProjectViewProjectNode" />
<item name="Drogon" type="462c0819:PsiDirectoryNode" />
<item name="capturer" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="Drogon" type="b2602c69:ProjectViewProjectNode" /> <item name="Drogon" type="b2602c69:ProjectViewProjectNode" />
<item name="Drogon" type="462c0819:PsiDirectoryNode" /> <item name="Drogon" type="462c0819:PsiDirectoryNode" />
<item name="core" type="462c0819:PsiDirectoryNode" /> <item name="core" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="Drogon" type="b2602c69:ProjectViewProjectNode" />
<item name="Drogon" type="462c0819:PsiDirectoryNode" />
<item name="db_layer" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Drogon" type="b2602c69:ProjectViewProjectNode" />
<item name="Drogon" type="462c0819:PsiDirectoryNode" />
<item name="db_layer" type="462c0819:PsiDirectoryNode" />
<item name="db_init_scripts" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Drogon" type="b2602c69:ProjectViewProjectNode" />
<item name="Drogon" type="462c0819:PsiDirectoryNode" />
<item name="explorer" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Drogon" type="b2602c69:ProjectViewProjectNode" />
<item name="Drogon" type="462c0819:PsiDirectoryNode" />
<item name="geocoder" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="Drogon" type="b2602c69:ProjectViewProjectNode" /> <item name="Drogon" type="b2602c69:ProjectViewProjectNode" />
<item name="Drogon" type="462c0819:PsiDirectoryNode" /> <item name="Drogon" type="462c0819:PsiDirectoryNode" />
@ -299,7 +315,6 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@ -331,28 +346,7 @@
</list> </list>
</option> </option>
</component> </component>
<component name="RunManager" selected="Python.geocoder"> <component name="RunManager" selected="Python.mysql_wrapper">
<configuration name="capturer" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="Drogon" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/capturer" />
<option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/capturer/capturer.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="true" />
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
<option name="REDIRECT_INPUT" value="false" />
<option name="INPUT_FILE" value="" />
<method v="2" />
</configuration>
<configuration name="capturer_tests" type="PythonConfigurationType" factoryName="Python" temporary="true"> <configuration name="capturer_tests" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="Drogon" /> <module name="Drogon" />
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
@ -395,6 +389,27 @@
<option name="INPUT_FILE" value="" /> <option name="INPUT_FILE" value="" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="mysql_wrapper" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="Drogon" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/core" />
<option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/core/mysql_wrapper.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
<option name="REDIRECT_INPUT" value="false" />
<option name="INPUT_FILE" value="" />
<method v="2" />
</configuration>
<configuration name="refresher" type="PythonConfigurationType" factoryName="Python" temporary="true"> <configuration name="refresher" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="Drogon" /> <module name="Drogon" />
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
@ -438,19 +453,19 @@
<method v="2" /> <method v="2" />
</configuration> </configuration>
<list> <list>
<item itemvalue="Python.capturer" />
<item itemvalue="Python.refresher_tests" /> <item itemvalue="Python.refresher_tests" />
<item itemvalue="Python.refresher" /> <item itemvalue="Python.refresher" />
<item itemvalue="Python.capturer_tests" /> <item itemvalue="Python.capturer_tests" />
<item itemvalue="Python.geocoder" /> <item itemvalue="Python.geocoder" />
<item itemvalue="Python.mysql_wrapper" />
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Python.mysql_wrapper" />
<item itemvalue="Python.geocoder" /> <item itemvalue="Python.geocoder" />
<item itemvalue="Python.capturer_tests" /> <item itemvalue="Python.capturer_tests" />
<item itemvalue="Python.refresher" /> <item itemvalue="Python.refresher" />
<item itemvalue="Python.refresher_tests" /> <item itemvalue="Python.refresher_tests" />
<item itemvalue="Python.capturer" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
@ -621,7 +636,7 @@
<frame x="0" y="-2" width="1920" height="1082" extended-state="6" /> <frame x="0" y="-2" width="1920" height="1082" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.48076922" visible="true" weight="0.14918292" /> <window_info content_ui="combo" id="Project" order="0" sideWeight="0.48076922" visible="true" weight="0.14918292" />
<window_info id="Structure" order="1" sideWeight="0.5192308" side_tool="true" weight="0.14918292" /> <window_info id="Structure" order="1" sideWeight="0.5192308" side_tool="true" weight="0.14918292" />
<window_info id="Favorites" order="2" sideWeight="0.5015674" side_tool="true" weight="0.14918292" /> <window_info id="Favorites" order="2" sideWeight="0.5015674" side_tool="true" weight="0.14918292" />
<window_info active="true" id="Repositories" order="3" sideWeight="0.49529782" visible="true" weight="0.32999474" /> <window_info active="true" id="Repositories" order="3" sideWeight="0.49529782" visible="true" weight="0.32999474" />
@ -629,11 +644,11 @@
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32983193" /> <window_info anchor="bottom" id="Find" order="1" weight="0.32983193" />
<window_info anchor="bottom" id="Run" order="2" weight="0.32983193" /> <window_info anchor="bottom" id="Run" order="2" weight="0.32983193" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.39915967" /> <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.39915967" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" sideWeight="0.49973643" weight="0.32878152" /> <window_info anchor="bottom" id="TODO" order="6" sideWeight="0.49973643" weight="0.32878152" />
<window_info anchor="bottom" id="Version Control" order="7" sideWeight="0.49973643" visible="true" weight="0.269958" /> <window_info anchor="bottom" id="Version Control" order="7" sideWeight="0.49973643" weight="0.269958" />
<window_info anchor="bottom" id="Terminal" order="8" weight="0.32983193" /> <window_info anchor="bottom" id="Terminal" order="8" weight="0.32983193" />
<window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.5007907" side_tool="true" weight="0.32983193" /> <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.5007907" side_tool="true" weight="0.32983193" />
<window_info anchor="bottom" id="Python Console" order="10" sideWeight="0.49920928" weight="0.32983193" /> <window_info anchor="bottom" id="Python Console" order="10" sideWeight="0.49920928" weight="0.32983193" />
@ -878,57 +893,8 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/core/alerts.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="7" column="34" selection-start-line="7" selection-start-column="34" selection-end-line="7" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file:///usr/lib/python3/dist-packages/apport_python_hook.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="720">
<caret line="49" column="18" selection-start-line="49" selection-start-column="18" selection-end-line="49" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_1.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3045">
<caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/core/scrapping_utils.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="615">
<caret line="41" column="23" selection-start-line="41" selection-start-column="23" selection-end-line="41" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/db_layer/db_init_scripts/tables.sql" /> <entry file="file://$PROJECT_DIR$/db_layer/db_init_scripts/tables.sql" />
<entry file="file://$PROJECT_DIR$/db_layer/db_init_scripts/views.sql" /> <entry file="file://$PROJECT_DIR$/db_layer/db_init_scripts/views.sql" />
<entry file="file://$PROJECT_DIR$/db_layer/capturing_tasks_interface.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" selection-start-line="1" selection-end-line="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tests/capturer_tests.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-end-line="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/refresher/refresher.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="16" selection-start-line="16" selection-end-line="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tests/geocoder_tests.py"> <entry file="file://$PROJECT_DIR$/tests/geocoder_tests.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state>
@ -941,13 +907,6 @@
<entry file="file://$PROJECT_DIR$/explorer/requirements.txt" /> <entry file="file://$PROJECT_DIR$/explorer/requirements.txt" />
<entry file="file://$PROJECT_DIR$/capturer/requirements.txt" /> <entry file="file://$PROJECT_DIR$/capturer/requirements.txt" />
<entry file="file://$PROJECT_DIR$/geocoder/requirements.txt" /> <entry file="file://$PROJECT_DIR$/geocoder/requirements.txt" />
<entry file="file://$PROJECT_DIR$/db_layer/capturas_interface.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="81" selection-start-line="81" selection-end-line="81" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/capturer/Dockerfile" /> <entry file="file://$PROJECT_DIR$/capturer/Dockerfile" />
<entry file="file://$PROJECT_DIR$/refresher/requirements.txt" /> <entry file="file://$PROJECT_DIR$/refresher/requirements.txt" />
<entry file="file://$PROJECT_DIR$/geocoder/Dockerfile" /> <entry file="file://$PROJECT_DIR$/geocoder/Dockerfile" />
@ -955,62 +914,115 @@
<entry file="file://$PROJECT_DIR$/db_layer/__init__.py"> <entry file="file://$PROJECT_DIR$/db_layer/__init__.py">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/core/mysql_wrapper.py"> <entry file="file://$PROJECT_DIR$/db_layer/db_init_scripts/users.sql" />
<entry file="file://$PROJECT_DIR$/db_layer/capturas_interface.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135"> <state relative-caret-position="1200">
<caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" /> <caret line="80" column="39" selection-start-line="80" selection-start-column="39" selection-end-line="80" selection-end-column="39" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/capturer/capturer.py"> <entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_1.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240"> <state relative-caret-position="3045">
<caret line="26" column="34" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" /> <caret line="203" column="35" selection-start-line="203" selection-start-column="35" selection-end-line="203" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/geocoder/geocoder.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1950">
<caret line="130" column="22" lean-forward="true" selection-start-line="130" selection-start-column="22" selection-end-line="130" selection-end-column="22" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/explorer/explorer.py"> <entry file="file://$PROJECT_DIR$/explorer/explorer.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165"> <state relative-caret-position="4215">
<caret line="95" column="88" selection-start-line="95" selection-start-column="88" selection-end-line="95" selection-end-column="88" /> <caret line="281" selection-start-line="281" selection-end-line="281" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/core/config.py"> <entry file="file://$PROJECT_DIR$/tests/capturer_tests.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405"> <state relative-caret-position="255">
<caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" /> <caret line="17" selection-start-line="17" selection-end-line="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/db_layer/capturing_tasks_interface.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" selection-start-line="1" selection-end-line="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/core/alerts.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="7" column="34" selection-start-line="7" selection-start-column="34" selection-end-line="7" selection-end-column="34" />
<folding> <folding>
<element signature="e#0#22#0" expanded="true" /> <element signature="e#0#46#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/db_layer/db_init_scripts/users.sql"> <entry file="file://$PROJECT_DIR$/geocoder/geocoder.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45"> <state relative-caret-position="225">
<caret line="3" column="16" lean-forward="true" selection-start-line="3" selection-start-column="16" selection-end-line="3" selection-end-column="16" /> <caret line="15" column="21" selection-start-line="15" selection-start-column="21" selection-end-line="15" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/capturer/capturer.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="613">
<caret line="87" selection-start-line="87" selection-end-line="87" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/db_layer/Dockerfile"> <entry file="file://$PROJECT_DIR$/db_layer/Dockerfile">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60"> <state relative-caret-position="60">
<caret line="4" column="51" selection-start-line="4" selection-start-column="51" selection-end-line="4" selection-end-column="51" /> <caret line="4" selection-start-line="4" selection-end-line="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/core/scrapping_utils.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="613">
<caret line="41" column="23" selection-start-line="41" selection-start-column="23" selection-end-line="41" selection-end-column="23" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/deployer.sh"> <entry file="file://$PROJECT_DIR$/deployer.sh">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330"> <state relative-caret-position="795">
<caret line="76" selection-start-line="76" selection-end-line="76" selection-end-column="29" /> <caret line="80" column="50" lean-forward="true" selection-start-line="80" selection-start-column="50" selection-end-line="80" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/refresher/refresher.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405">
<caret line="27" column="27" selection-start-line="27" selection-start-column="27" selection-end-line="27" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file:///usr/lib/python3/dist-packages/apport_python_hook.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="173">
<caret line="46" selection-start-line="46" selection-end-line="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/core/mysql_wrapper.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
<caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/core/config.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="33" selection-start-line="12" selection-start-column="33" selection-end-line="12" selection-end-column="33" />
<folding>
<element signature="e#0#22#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>

4
core/config.py
View file

@ -1,5 +1,5 @@
from os import environ from os import environ
from datetime import datetime import datetime
databases = {'dev':{'host': 'dev_drogon_db', databases = {'dev':{'host': 'dev_drogon_db',
'user': 'drogon', 'user': 'drogon',
@ -10,7 +10,7 @@ databases = {'dev':{'host': 'dev_drogon_db',
'prd':{'host': 'prd_drogon_db', 'prd':{'host': 'prd_drogon_db',
'user': 'drogon', 'user': 'drogon',
'password': 'noesfacilvivirsindrogon'}, 'password': 'noesfacilvivirsindrogon'},
'default'{'host': 'tst_drogon_db', 'default':{'host': 'tst_drogon_db',
'user': 'drogon', 'user': 'drogon',
'password': 'noesfacilvivirsindrogon'}} 'password': 'noesfacilvivirsindrogon'}}

5
core/mysql_wrapper.py
View file

@ -5,8 +5,8 @@ import mysql.connector
from core.alerts import alert_master from core.alerts import alert_master
from core.config import current_db_parameters from core.config import current_db_parameters
anuncios_db_parameters = current_db_parameters.update({'database': 'anuncios'}) anuncios_db_parameters = {'database': 'anuncios', **current_db_parameters}
tasks_db_parameters = current_db_parameters.update({'database': 'tasks'}) tasks_db_parameters = {'database': 'tasks', **current_db_parameters}
class DatabaseWrapper(): class DatabaseWrapper():
@ -63,6 +63,7 @@ class DatabaseWrapper():
def get_anunciosdb(): def get_anunciosdb():
return DatabaseWrapper(anuncios_db_parameters) return DatabaseWrapper(anuncios_db_parameters)
def get_tasksdb(): def get_tasksdb():
return DatabaseWrapper(tasks_db_parameters) return DatabaseWrapper(tasks_db_parameters)

6
deployer.sh
View file

@ -3,9 +3,9 @@
set -x set -x
### Variables de entorno ### ### Variables de entorno ###
echo "DROGON_ENV=tst" >> /etc/profile.d/drogon_variables echo "DROGON_ENV=tst" | tee -a /etc/profile.d/drogon_variables.sh
echo "DB_SERVICE_NAME=tst_drogon_db" >> /etc/profile.d/drogon_variables echo "DB_SERVICE_NAME=tst_drogon_db" | tee -a /etc/profile.d/drogon_variables.sh
echo "NETWORK_NAME=tst_drogon_network" >> /etc/profile.d/drogon_variables echo "NETWORK_NAME=tst_drogon_network" | tee -a /etc/profile.d/drogon_variables.sh
DROGON_ENV=tst DROGON_ENV=tst
DB_SERVICE_NAME=tst_drogon_db DB_SERVICE_NAME=tst_drogon_db
NETWORK_NAME=tst_drogon_network NETWORK_NAME=tst_drogon_network