Skip to content

Commit 6c95007

Browse files
x0sinax0sina
committed
refactor(node): remove max_logs and gather_logs properties from Node model and related components
1 parent 85d6391 commit 6c95007

File tree

11 files changed

+32
-93
lines changed

11 files changed

+32
-93
lines changed

‎app/db/migrations/versions/remove_gather_logs_column.py‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
"""remove gather logs and max logs columns
2+
3+
Revision ID: 99076844dee6
4+
Revises: 2dffd851d87c
5+
Create Date: 2025-11-14 17:19:08.568000
6+
7+
"""
8+
from alembic import op
9+
import sqlalchemy as sa
10+
11+
12+
# revision identifiers, used by Alembic.
13+
revision = '99076844dee6'
14+
down_revision = '2dffd851d87c'
15+
branch_labels = None
16+
depends_on = None
17+
18+
19+
def upgrade() -> None:
20+
# ### commands auto generated by Alembic - please adjust! ###
21+
op.drop_column('nodes', 'gather_logs')
22+
op.drop_column('nodes', 'max_logs')
23+
# ### end Alembic commands ###
24+
25+
26+
def downgrade() -> None:
27+
# ### commands auto generated by Alembic - please adjust! ###
28+
op.add_column('nodes', sa.Column('max_logs', sa.BigInteger(), server_default=sa.text('1000'), nullable=False))
29+
op.add_column('nodes', sa.Column('gather_logs', sa.Boolean(), server_default='1', nullable=False))
30+
# ### end Alembic commands ###
31+

‎app/db/models.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -522,8 +522,6 @@ class Node(Base):
522522
server_default=NodeConnectionType.grpc.name,
523523
)
524524
keep_alive: Mapped[int] = mapped_column(unique=False, default=0)
525-
max_logs: Mapped[int] = mapped_column(BigInteger, unique=False, default=1000, server_default=text("1000"))
526-
gather_logs: Mapped[bool] = mapped_column(default=True, server_default="1")
527525

528526
@hybrid_property
529527
def reseted_uplink(self) -> int:

‎app/models/node.py‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,8 @@ class Node(BaseModel):
3535
connection_type: NodeConnectionType
3636
server_ca: str
3737
keep_alive: int
38-
max_logs: int = Field(gt=0, default=1000)
3938
core_config_id: int
4039
api_key: str
41-
gather_logs: bool = Field(default=True)
4240
data_limit: int = Field(default=0)
4341
data_limit_reset_strategy: DataLimitResetStrategy = Field(default=DataLimitResetStrategy.no_reset)
4442
reset_time: int = Field(default=-1)
@@ -55,10 +53,8 @@ class NodeCreate(Node):
5553
"server_ca": "-----BEGIN CERTIFICATE-----\n...\n-----END CERTIFICATE-----",
5654
"connection_type": "grpc",
5755
"keep_alive": 60,
58-
"max_logs": 1000,
5956
"core_config_id": 1,
6057
"api_key": "valid uuid",
61-
"gather_logs": True,
6258
}
6359
}
6460
)
@@ -160,10 +156,8 @@ class NodeModify(NodeCreate):
160156
server_ca: str | None = Field(default=None)
161157
connection_type: NodeConnectionType | None = Field(default=None)
162158
keep_alive: int | None = Field(default=None)
163-
max_logs: int | None = Field(default=None)
164159
core_config_id: int | None = Field(default=None)
165160
api_key: str | None = Field(default=None)
166-
gather_logs: bool | None = Field(default=None)
167161
data_limit: int | None = None
168162
data_limit_reset_strategy: DataLimitResetStrategy | None = None
169163
reset_time: int | None = None
@@ -179,10 +173,8 @@ class NodeModify(NodeCreate):
179173
"connection_type": "grpc",
180174
"server_ca": "-----BEGIN CERTIFICATE-----\n...\n-----END CERTIFICATE-----",
181175
"keep_alive": 60,
182-
"max_logs": 1000,
183176
"core_config_id": 1,
184177
"api_key": "valid uuid",
185-
"gather_logs": True,
186178
}
187179
}
188180
)

‎dashboard/public/statics/locales/en.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
"connectionType": "Connection Type",
3737
"serverCA": "Server CA",
3838
"keepAlive": "Keep Alive",
39-
"maxLogs": "Max Logs",
40-
"maxLogsPlaceHolder": "Enter max logs (in seconds)",
4139
"status": "Status",
4240
"actions": "Actions",
4341
"connected": "Connected",
@@ -1315,8 +1313,6 @@
13151313
"portPlaceholder": "Enter node port",
13161314
"usageRatio": "Usage Ratio",
13171315
"usageRatioPlaceholder": "Enter usage ratio",
1318-
"maxLogs": "Max Logs",
1319-
"maxLogsPlaceholder": "Enter max logs",
13201316
"connectionType": "Connection Type",
13211317
"keepAlive": "Keep Alive",
13221318
"keepAliveDescription": "Set the keep alive interval",
@@ -1383,8 +1379,6 @@
13831379
"selectDayOfWeek": "Select day of week",
13841380
"selectDayOfMonth": "Select day of month",
13851381
"selectDayOfYear": "Select day of year",
1386-
"gatherLogs": "Gather Logs",
1387-
"gatherLogsDescription": "Enable log collection from this node for monitoring and debugging purposes",
13881382
"statusMessages": {
13891383
"checkUnavailableForNew": "Status check not available for new nodes. Create the node first to check its status."
13901384
},

‎dashboard/public/statics/locales/fa.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1155,8 +1155,6 @@
11551155
"portPlaceholder": "پورت گره را وارد کنید",
11561156
"usageRatio": "نسبت استفاده",
11571157
"usageRatioPlaceholder": "نسبت استفاده را وارد کنید",
1158-
"maxLogs": "حداکثر لاگ‌ها",
1159-
"maxLogsPlaceholder": "حداکثر لاگ‌ها را وارد کنید",
11601158
"connectionType": "نوع اتصال",
11611159
"keepAlive": "نگهداری اتصال",
11621160
"keepAliveDescription": "تنظیم فاصله نگهداری اتصال",
@@ -1223,8 +1221,6 @@
12231221
"selectDayOfWeek": "روز هفته را انتخاب کنید",
12241222
"selectDayOfMonth": "روز ماه را انتخاب کنید",
12251223
"selectDayOfYear": "روز سال را انتخاب کنید",
1226-
"gatherLogs": "جمع‌آوری لاگ‌ها",
1227-
"gatherLogsDescription": "فعال‌سازی جمع‌آوری لاگ‌ها از این گره برای نظارت و عیب‌یابی",
12281224
"statusMessages": {
12291225
"checkUnavailableForNew": "بررسی وضعیت برای گره‌های جدید در دسترس نیست. ابتدا گره را ایجاد کنید تا بتوانید وضعیت آن را بررسی کنید."
12301226
},
@@ -1263,8 +1259,6 @@
12631259
"connectionType": "نوع اتصال",
12641260
"serverCA": "گواهی سرور",
12651261
"keepAlive": "حفظ اتصال",
1266-
"maxLogs": "حداکثر لاگ‌ها",
1267-
"maxLogsPlaceHolder": "حداکثر لاگ‌ها را وارد کنید (ثانیه)",
12681262
"status": "وضعیت",
12691263
"actions": "عملیات",
12701264
"connected": "متصل",

‎dashboard/public/statics/locales/ru.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@
6363
"connectionType": "Тип соединения",
6464
"serverCA": "Сертификат сервера",
6565
"keepAlive": "Поддержание соединения",
66-
"maxLogs": "Максимум логов",
67-
"maxLogsPlaceHolder": "Введите максимальное количество логов (в секундах)",
6866
"status": "Статус",
6967
"actions": "Действия",
7068
"connected": "Подключено",
@@ -1214,8 +1212,6 @@
12141212
"portPlaceholder": "Введите порт узла",
12151213
"usageRatio": "Коэффициент использования",
12161214
"usageRatioPlaceholder": "Введите коэффициент использования",
1217-
"maxLogs": "Максимум логов",
1218-
"maxLogsPlaceholder": "Введите максимум логов",
12191215
"connectionType": "Тип подключения",
12201216
"keepAlive": "Поддержание соединения",
12211217
"keepAliveDescription": "Установите интервал поддержания соединения",
@@ -1282,8 +1278,6 @@
12821278
"selectDayOfWeek": "Выберите день недели",
12831279
"selectDayOfMonth": "Выберите день месяца",
12841280
"selectDayOfYear": "Выберите день года",
1285-
"gatherLogs": "Сбор логов",
1286-
"gatherLogsDescription": "Включить сбор логов с этого узла для мониторинга и отладки",
12871281
"statusMessages": {
12881282
"checkUnavailableForNew": "Проверка статуса недоступна для новых узлов. Сначала создайте узел, чтобы проверить его статус."
12891283
},

‎dashboard/public/statics/locales/zh.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
"connectionType": "连接类型",
3535
"serverCA": "服务器证书",
3636
"keepAlive": "保持连接",
37-
"maxLogs": "最大日志数",
38-
"maxLogsPlaceHolder": "输入最大日志数（以秒为单位）",
3937
"status": "状态",
4038
"actions": "操作",
4139
"connected": "已连接",
@@ -1272,8 +1270,6 @@
12721270
"portPlaceholder": "输入节点端口",
12731271
"usageRatio": "使用系数",
12741272
"usageRatioPlaceholder": "输入使用系数",
1275-
"maxLogs": "最大日志数",
1276-
"maxLogsPlaceholder": "输入最大日志数",
12771273
"connectionType": "连接类型",
12781274
"keepAlive": "保持连接",
12791275
"keepAliveDescription": "设置保持连接间隔",
@@ -1329,8 +1325,6 @@
13291325
"selectDayOfWeek": "选择星期几",
13301326
"selectDayOfMonth": "选择月份中的日期",
13311327
"selectDayOfYear": "选择年份中的日期",
1332-
"gatherLogs": "收集日志",
1333-
"gatherLogsDescription": "启用从此节点收集日志以进行监控和调试",
13341328
"statusMessages": {
13351329
"checkUnavailableForNew": "新节点无法进行状态检查。请先创建节点，然后检查其状态。"
13361330
},

‎dashboard/src/components/dialogs/node-modal.tsx‎

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,8 @@ export const nodeFormSchema = z.object({
3131
server_ca: z.string().min(1, 'Server CA is required'),
3232
keep_alive: z.number().min(0, 'Keep alive must be 0 or greater'),
3333
keep_alive_unit: z.enum(['seconds', 'minutes', 'hours']).default('seconds'),
34-
max_logs: z.number().min(1, 'Max logs is required'),
3534
api_key: z.string().min(1, 'API key is required'),
3635
core_config_id: z.number().min(1, 'Core configuration is required'),
37-
gather_logs: z.boolean().default(true),
3836
data_limit: z.number().min(0).optional().nullable(),
3937
data_limit_reset_strategy: z.nativeEnum(DataLimitResetStrategy).optional().nullable(),
4038
reset_time: z.union([z.null(), z.undefined(), z.number().min(-1)]),
@@ -141,10 +139,8 @@ export default function NodeModal({ isDialogOpen, onOpenChange, form, editingNod
141139
connection_type: nodeData.connection_type,
142140
server_ca: nodeData.server_ca,
143141
keep_alive: nodeData.keep_alive,
144-
max_logs: nodeData.max_logs,
145142
api_key: (nodeData.api_key as string) || '',
146143
core_config_id: nodeData.core_config_id ?? cores?.cores?.[0]?.id,
147-
gather_logs: nodeData.gather_logs ?? true,
148144
data_limit: dataLimitGB,
149145
data_limit_reset_strategy: nodeData.data_limit_reset_strategy ?? DataLimitResetStrategy.no_reset,
150146
reset_time: nodeData.reset_time ?? null,
@@ -169,10 +165,8 @@ export default function NodeModal({ isDialogOpen, onOpenChange, form, editingNod
169165
server_ca: '',
170166
keep_alive: 60,
171167
keep_alive_unit: 'seconds',
172-
max_logs: 1000,
173168
api_key: '',
174169
core_config_id: cores?.cores?.[0]?.id,
175-
gather_logs: true,
176170
data_limit: 0,
177171
data_limit_reset_strategy: DataLimitResetStrategy.no_reset,
178172
reset_time: -1,
@@ -330,7 +324,7 @@ export default function NodeModal({ isDialogOpen, onOpenChange, form, editingNod
330324
onOpenChange(false)
331325
form.reset()
332326
} catch (error: any) {
333-
const fields = ['name', 'address', 'port', 'core_config_id', 'api_key', 'max_logs', 'keep_alive_unit', 'keep_alive', 'server_ca', 'connection_type', '']
327+
const fields = ['name', 'address', 'port', 'core_config_id', 'api_key', 'keep_alive_unit', 'keep_alive', 'server_ca', 'connection_type', '']
334328
handleError({ error, fields, form, contextKey: 'nodes' })
335329
}
336330
}
@@ -584,25 +578,6 @@ export default function NodeModal({ isDialogOpen, onOpenChange, form, editingNod
584578
)}
585579
/>
586580

587-
<FormField
588-
control={form.control}
589-
name="max_logs"
590-
render={({ field }) => (
591-
<FormItem className="flex-1">
592-
<FormLabel>{t('nodes.maxLogs')}</FormLabel>
593-
<FormControl>
594-
<Input
595-
isError={!!form.formState.errors.max_logs}
596-
type="number"
597-
placeholder={t('nodes.maxLogsPlaceholder')}
598-
{...field}
599-
onChange={e => field.onChange(parseInt(e.target.value))}
600-
/>
601-
</FormControl>
602-
<FormMessage />
603-
</FormItem>
604-
)}
605-
/>
606581
</div>
607582

608583
<FormField
@@ -701,22 +676,6 @@ export default function NodeModal({ isDialogOpen, onOpenChange, form, editingNod
701676
}}
702677
/>
703678

704-
<FormField
705-
control={form.control}
706-
name="gather_logs"
707-
render={({ field }) => (
708-
<FormItem className="flex flex-row items-center justify-between rounded-lg border p-4">
709-
<div className="space-y-0.5">
710-
<FormLabel className="text-sm">{t('nodeModal.gatherLogs')}</FormLabel>
711-
<p className="text-xs text-muted-foreground">{t('nodeModal.gatherLogsDescription')}</p>
712-
</div>
713-
<FormControl>
714-
<Switch checked={field.value} onCheckedChange={field.onChange} />
715-
</FormControl>
716-
</FormItem>
717-
)}
718-
/>
719-
720679
<div className="flex flex-col gap-4">
721680
<FormField
722681
control={form.control}

‎dashboard/src/components/nodes/nodes-list.tsx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ const initialDefaultValues: Partial<NodeFormValues> = {
1919
connection_type: NodeConnectionType.grpc,
2020
server_ca: '',
2121
keep_alive: 20000,
22-
max_logs: 100,
2322
}
2423

2524
export default function NodesList() {
@@ -57,7 +56,6 @@ export default function NodesList() {
5756
connection_type: node.connection_type,
5857
server_ca: node.server_ca,
5958
keep_alive: node.keep_alive,
60-
max_logs: node.max_logs,
6159
})
6260
setIsDialogOpen(true)
6361
}
@@ -78,7 +76,6 @@ export default function NodesList() {
7876
connection_type: node.connection_type,
7977
server_ca: node.server_ca,
8078
keep_alive: node.keep_alive,
81-
max_logs: node.max_logs,
8279
status: newStatus,
8380
},
8481
})

‎dashboard/src/pages/_dashboard._index.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,8 @@ const Dashboard = () => {
145145
server_ca: '',
146146
keep_alive: 60,
147147
keep_alive_unit: 'seconds',
148-
max_logs: 1000,
149148
api_key: '',
150149
core_config_id: 1,
151-
gather_logs: true,
152150
},
153151
})
154152

0 commit comments

Comments
 (0)