[DeepSentimentCrawling] 修正 MediaCrawler 数据库配置不匹配问题 (使用 postgresql 而非 postgres)
Showing
1 changed file
with
15 additions
and
15 deletions
| @@ -57,7 +57,7 @@ class PlatformCrawler: | @@ -57,7 +57,7 @@ class PlatformCrawler: | ||
| 57 | pg_password = config.settings.DB_PASSWORD if is_postgresql else "bettafish" | 57 | pg_password = config.settings.DB_PASSWORD if is_postgresql else "bettafish" |
| 58 | pg_user = config.settings.DB_USER if is_postgresql else "bettafish" | 58 | pg_user = config.settings.DB_USER if is_postgresql else "bettafish" |
| 59 | pg_host = config.settings.DB_HOST if is_postgresql else "127.0.0.1" | 59 | pg_host = config.settings.DB_HOST if is_postgresql else "127.0.0.1" |
| 60 | - pg_port = config.settings.DB_PORT if is_postgresql else 5432 | 60 | + pg_port = config.settings.DB_PORT if is_postgresql else 5444 |
| 61 | pg_db_name = config.settings.DB_NAME if is_postgresql else "bettafish" | 61 | pg_db_name = config.settings.DB_NAME if is_postgresql else "bettafish" |
| 62 | 62 | ||
| 63 | # 替换数据库配置 - 使用MindSpider的数据库配置 | 63 | # 替换数据库配置 - 使用MindSpider的数据库配置 |
| @@ -122,19 +122,19 @@ mongodb_config = {{ | @@ -122,19 +122,19 @@ mongodb_config = {{ | ||
| 122 | "db_name": MONGODB_DB_NAME, | 122 | "db_name": MONGODB_DB_NAME, |
| 123 | }} | 123 | }} |
| 124 | 124 | ||
| 125 | -# postgres config - 使用MindSpider的数据库配置(如果DB_DIALECT是postgresql)或环境变量 | ||
| 126 | -POSTGRES_DB_PWD = os.getenv("POSTGRES_DB_PWD", "{pg_password}") | ||
| 127 | -POSTGRES_DB_USER = os.getenv("POSTGRES_DB_USER", "{pg_user}") | ||
| 128 | -POSTGRES_DB_HOST = os.getenv("POSTGRES_DB_HOST", "{pg_host}") | ||
| 129 | -POSTGRES_DB_PORT = os.getenv("POSTGRES_DB_PORT", "{pg_port}") | ||
| 130 | -POSTGRES_DB_NAME = os.getenv("POSTGRES_DB_NAME", "{pg_db_name}") | 125 | +# postgresql config - 使用MindSpider的数据库配置(如果DB_DIALECT是postgresql)或环境变量 |
| 126 | +POSTGRESQL_DB_PWD = os.getenv("POSTGRESQL_DB_PWD", "{pg_password}") | ||
| 127 | +POSTGRESQL_DB_USER = os.getenv("POSTGRESQL_DB_USER", "{pg_user}") | ||
| 128 | +POSTGRESQL_DB_HOST = os.getenv("POSTGRESQL_DB_HOST", "{pg_host}") | ||
| 129 | +POSTGRESQL_DB_PORT = os.getenv("POSTGRESQL_DB_PORT", "{pg_port}") | ||
| 130 | +POSTGRESQL_DB_NAME = os.getenv("POSTGRESQL_DB_NAME", "{pg_db_name}") | ||
| 131 | 131 | ||
| 132 | -postgres_db_config = {{ | ||
| 133 | - "user": POSTGRES_DB_USER, | ||
| 134 | - "password": POSTGRES_DB_PWD, | ||
| 135 | - "host": POSTGRES_DB_HOST, | ||
| 136 | - "port": POSTGRES_DB_PORT, | ||
| 137 | - "db_name": POSTGRES_DB_NAME, | 132 | +postgresql_db_config = {{ |
| 133 | + "user": POSTGRESQL_DB_USER, | ||
| 134 | + "password": POSTGRESQL_DB_PWD, | ||
| 135 | + "host": POSTGRESQL_DB_HOST, | ||
| 136 | + "port": POSTGRESQL_DB_PORT, | ||
| 137 | + "db_name": POSTGRESQL_DB_NAME, | ||
| 138 | }} | 138 | }} |
| 139 | 139 | ||
| 140 | ''' | 140 | ''' |
| @@ -169,7 +169,7 @@ postgres_db_config = {{ | @@ -169,7 +169,7 @@ postgres_db_config = {{ | ||
| 169 | # 判断数据库类型,确定 SAVE_DATA_OPTION | 169 | # 判断数据库类型,确定 SAVE_DATA_OPTION |
| 170 | db_dialect = (config.settings.DB_DIALECT or "mysql").lower() | 170 | db_dialect = (config.settings.DB_DIALECT or "mysql").lower() |
| 171 | is_postgresql = db_dialect in ("postgresql", "postgres") | 171 | is_postgresql = db_dialect in ("postgresql", "postgres") |
| 172 | - save_data_option = "postgres" if is_postgresql else "db" | 172 | + save_data_option = "postgresql" if is_postgresql else "db" |
| 173 | 173 | ||
| 174 | base_config_path = self.mediacrawler_path / "config" / "base_config.py" | 174 | base_config_path = self.mediacrawler_path / "config" / "base_config.py" |
| 175 | 175 | ||
| @@ -253,7 +253,7 @@ postgres_db_config = {{ | @@ -253,7 +253,7 @@ postgres_db_config = {{ | ||
| 253 | # 判断数据库类型,确定 save_data_option | 253 | # 判断数据库类型,确定 save_data_option |
| 254 | db_dialect = (config.settings.DB_DIALECT or "mysql").lower() | 254 | db_dialect = (config.settings.DB_DIALECT or "mysql").lower() |
| 255 | is_postgresql = db_dialect in ("postgresql", "postgres") | 255 | is_postgresql = db_dialect in ("postgresql", "postgres") |
| 256 | - save_data_option = "postgres" if is_postgresql else "db" | 256 | + save_data_option = "postgresql" if is_postgresql else "db" |
| 257 | 257 | ||
| 258 | # 构建命令 | 258 | # 构建命令 |
| 259 | cmd = [ | 259 | cmd = [ |
-
Please register or login to post a comment