Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

Commit

Permalink
Merge pull request #3579 from pypeclub/feature/new_import_locations
Browse files Browse the repository at this point in the history
General: Update imports in start script
  • Loading branch information
iLLiCiTiT authored Jul 27, 2022
2 parents ebb38aa + f7cb4cd commit 07ac291
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 10 deletions.
11 changes: 6 additions & 5 deletions openpype/settings/defaults/system_settings/modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,16 +131,17 @@
}
}
},
"kitsu": {
"enabled": false,
"server": ""
},
"shotgrid": {
"enabled": false,
"leecher_manager_url": "http://127.0.0.1:3000",
"leecher_backend_url": "http://127.0.0.1:8090",
"filter_projects_by_login": true,
"shotgrid_settings": {}
},
"kitsu": {
"enabled": false,
"server": ""
},
"timers_manager": {
"enabled": true,
"auto_stop": true,
Expand Down Expand Up @@ -209,4 +210,4 @@
"linux": ""
}
}
}
}
14 changes: 9 additions & 5 deletions start.py
Original file line number Diff line number Diff line change
Expand Up @@ -1113,8 +1113,12 @@ def boot():

def get_info(use_staging=None) -> list:
"""Print additional information to console."""
from openpype.lib.mongo import get_default_components
from openpype.lib.log import PypeLogger
from openpype.client.mongo import get_default_components
try:
from openpype.lib.log import Logger
except ImportError:
# Backwards compatibility for 'PypeLogger'
from openpype.lib.log import PypeLogger as Logger

components = get_default_components()

Expand All @@ -1141,14 +1145,14 @@ def get_info(use_staging=None) -> list:
os.environ.get("MUSTER_REST_URL")))

# Reinitialize
PypeLogger.initialize()
Logger.initialize()

mongo_components = get_default_components()
if mongo_components["host"]:
inf.append(("Logging to MongoDB", mongo_components["host"]))
inf.append((" - port", mongo_components["port"] or "<N/A>"))
inf.append((" - database", PypeLogger.log_database_name))
inf.append((" - collection", PypeLogger.log_collection_name))
inf.append((" - database", Logger.log_database_name))
inf.append((" - collection", Logger.log_collection_name))
inf.append((" - user", mongo_components["username"] or "<N/A>"))
if mongo_components["auth_db"]:
inf.append((" - auth source", mongo_components["auth_db"]))
Expand Down

0 comments on commit 07ac291

Please sign in to comment.