vanja/feishin
1
0
Fork 0
mirror of https://github.com/jeffvli/feishin.git synced 2026-05-15 04:51:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove logMsg and refactor messages inline

Browse Source
This commit is contained in:
jeffvli
2026-02-13 02:34:22 -08:00
parent 02a5395453
commit bca14176fb
14 changed files with 150 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/hooks/use-server-authenticated.ts
+11 -12
View File
@@ -10,7 +10,6 @@ import { controller } from '/@/renderer/api/controller';
import { AppRoute } from '/@/renderer/router/routes';
import { getServerById, useAuthStoreActions, useCurrentServer } from '/@/renderer/store';
import { LogCategory, logFn } from '/@/renderer/utils/logger';
import { logMsg } from '/@/renderer/utils/logger-message';
import { toast } from '/@/shared/components/toast/toast';
import { AuthState } from '/@/shared/types/types';
@@ -62,7 +61,7 @@ export const useServerAuthenticated = () => {
}
// First, try getUserInfo to check if current credentials are still valid
logFn.info(logMsg[LogCategory.SYSTEM].authenticatingServer, {
logFn.info('Authenticating server', {
category: LogCategory.SYSTEM,
meta: {
method: 'getUserInfo',
@@ -117,7 +116,7 @@ export const useServerAuthenticated = () => {
}
} catch (serverInfoError) {
// Log but don't fail authentication if server info fetch fails
logFn.warn(logMsg[LogCategory.SYSTEM].serverAuthenticationSuccess, {
logFn.warn('Server authentication successful', {
category: LogCategory.SYSTEM,
meta: {
action: 'server_info_fetch_failed',
@@ -128,7 +127,7 @@ export const useServerAuthenticated = () => {
});
}
logFn.info(logMsg[LogCategory.SYSTEM].serverAuthenticationSuccess, {
logFn.info('Server authentication successful', {
category: LogCategory.SYSTEM,
meta: {
isAdmin: userInfo.isAdmin,
@@ -162,7 +161,7 @@ export const useServerAuthenticated = () => {
const password = await localSettings.passwordGet(serverWithAuth.id);
if (password) {
logFn.info(logMsg[LogCategory.SYSTEM].authenticatingServer, {
logFn.info('Authenticating server', {
category: LogCategory.SYSTEM,
meta: {
method: 'authenticate',
@@ -227,7 +226,7 @@ export const useServerAuthenticated = () => {
}
} catch (serverInfoError) {
// Log but don't fail authentication if server info fetch fails
logFn.warn(logMsg[LogCategory.SYSTEM].serverAuthenticationSuccess, {
logFn.warn('Server authentication successful', {
category: LogCategory.SYSTEM,
meta: {
action: 'server_info_fetch_failed',
@@ -238,7 +237,7 @@ export const useServerAuthenticated = () => {
});
}
logFn.info(logMsg[LogCategory.SYSTEM].serverAuthenticationSuccess, {
logFn.info('Server authentication successful', {
category: LogCategory.SYSTEM,
meta: {
isAdmin: authData.isAdmin,
@@ -275,7 +274,7 @@ export const useServerAuthenticated = () => {
if (isNetwork && retryAttempt < MAX_NETWORK_RETRIES) {
const nextRetry = retryAttempt + 1;
logFn.warn(logMsg[LogCategory.SYSTEM].serverAuthenticationFailed, {
logFn.warn('Server authentication failed', {
category: LogCategory.SYSTEM,
meta: {
action: 'network_error_retry',
@@ -298,7 +297,7 @@ export const useServerAuthenticated = () => {
// If network error and retries exhausted, redirect to no-network page
if (isNetwork && retryAttempt >= MAX_NETWORK_RETRIES) {
logFn.error(logMsg[LogCategory.SYSTEM].serverAuthenticationFailed, {
logFn.error('Server authentication failed', {
category: LogCategory.SYSTEM,
meta: {
action: 'network_error_max_retries_exceeded',
@@ -317,7 +316,7 @@ export const useServerAuthenticated = () => {
}
// For non-network errors, handle normally
logFn.error(logMsg[LogCategory.SYSTEM].serverAuthenticationFailed, {
logFn.error('Server authentication failed', {
category: LogCategory.SYSTEM,
meta: {
error: errorMessage,
@@ -353,7 +352,7 @@ export const useServerAuthenticated = () => {
useEffect(() => {
if (!server) {
logFn.debug(logMsg[LogCategory.SYSTEM].serverAuthenticationInvalid, {
logFn.debug('Server authentication invalid', {
category: LogCategory.SYSTEM,
meta: {
reason: 'No server selected',
@@ -369,7 +368,7 @@ export const useServerAuthenticated = () => {
retryCountRef.current = 0; // Reset retry count when server changes
if (!serverWithAuth) {
logFn.error(logMsg[LogCategory.SYSTEM].serverAuthenticationError, {
logFn.error('Server authentication error', {
category: LogCategory.SYSTEM,
meta: {
reason: 'Server not found in store',
src/renderer/hooks/use-sync-settings-to-main.ts
+3 -3
View File
@@ -4,8 +4,7 @@ import { useEffect, useRef } from 'react';
import i18n from '/@/i18n/i18n';
import { openRestartRequiredToast } from '/@/renderer/features/settings/restart-toast';
import { useSettingsStore } from '/@/renderer/store/settings.store';
import { logFn } from '/@/renderer/utils/logger';
import { logMsg } from '/@/renderer/utils/logger-message';
import { LogCategory, logFn } from '/@/renderer/utils/logger';
// Synchronizes settings from the renderer store to the main process electron store
// on app initialization. If there are differences, it updates the main store and shows
@@ -120,7 +119,8 @@ export const useSyncSettingsToMain = () => {
JSON.stringify(rendererValueNormalized)
) {
hasDifferences = true;
logFn.warn(logMsg.system.settingsSynchronized, {
logFn.warn('Differences found between renderer and main process settings', {
category: LogCategory.SYSTEM,
meta: {
mainStoreKey: mapping.mainStoreKey,
mainValue: mainValueNormalized,