Skip to content

Commit fc273be

Browse files
Change all PrintMessage to PrintLog (#33)
1 parent 37ba7a2 commit fc273be

File tree

5 files changed

+21
-25
lines changed

5 files changed

+21
-25
lines changed

Init.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ def setup_sentry():
3737

3838
enabled = params.GetBool("Enable", True)
3939
if not enabled:
40-
FreeCAD.Console.PrintMessage(
40+
FreeCAD.Console.PrintLog(
4141
"Sentry initializing, but FreeCAD Telemetry sending is disabled: no data will be transmitted\n"
4242
)
4343
dsn = None
4444
else:
45-
FreeCAD.Console.PrintMessage("Sentry initializing. FreeCAD Telemetry sending is active.\n")
45+
FreeCAD.Console.PrintLog("Sentry initializing. FreeCAD Telemetry sending is active.\n")
4646
init_sentry(dsn=dsn)
4747

4848

InitGui.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,12 @@ def setup_posthog():
4646
params = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Telemetry")
4747
enabled = params.GetBool("Enable", True)
4848
if not enabled:
49-
FreeCAD.Console.PrintMessage(
49+
FreeCAD.Console.PrintLog(
5050
"PostHog initializing, but FreeCAD launch metrics sending is disabled: no data will be transmitted\n"
5151
)
5252
return
5353
else:
54-
FreeCAD.Console.PrintMessage(
55-
"PostHog initializing. FreeCAD launch metrics are being sent.\n"
56-
)
54+
FreeCAD.Console.PrintLog("PostHog initializing. FreeCAD launch metrics are being sent.\n")
5755
posthog_launch()
5856

5957

@@ -99,7 +97,7 @@ class Telemetry(Workbench):
9997

10098
def __init__(self):
10199
super().__init__()
102-
FreeCAD.Console.PrintMessage("Telemetry workbench loaded\n")
100+
FreeCAD.Console.PrintLog("Telemetry workbench loaded\n")
103101

104102
def Activated(self):
105103
"""This function is executed when the workbench is activated"""

PosthogFC.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,25 +70,23 @@ def posthog_launch():
7070
addon = params.GetBool("SendAddonInformation", True)
7171
preferences = params.GetBool("SendPreferences", True)
7272

73-
FreeCAD.Console.PrintMessage("Telemetry Addon: Sending FreeCAD version data to Posthog\n")
73+
FreeCAD.Console.PrintLog("Telemetry Addon: Sending FreeCAD version data to Posthog\n")
7474
posthog_fc_startup()
7575
posthog_fc_version()
7676
if system:
77-
FreeCAD.Console.PrintMessage("Telemetry Addon: Sending FreeCAD system info to Posthog\n")
77+
FreeCAD.Console.PrintLog("Telemetry Addon: Sending FreeCAD system info to Posthog\n")
7878
posthog_system_info()
7979
if addon:
80-
FreeCAD.Console.PrintMessage("Telemetry Addon: Sending FreeCAD addon info to Posthog\n")
80+
FreeCAD.Console.PrintLog("Telemetry Addon: Sending FreeCAD addon info to Posthog\n")
8181
posthog_addon_list()
8282
if preferences:
83-
FreeCAD.Console.PrintMessage(
84-
"Telemetry Addon: Sending FreeCAD preferences info to Posthog\n"
85-
)
83+
FreeCAD.Console.PrintLog("Telemetry Addon: Sending FreeCAD preferences info to Posthog\n")
8684
posthog_preferences()
8785
params.SetString("LastSendTime", datetime.now().isoformat())
8886

8987

9088
def handle_error(exception: Exception, _payload: Optional[Dict[str, Any]]) -> None:
91-
FreeCAD.Console.PrintMessage(
89+
FreeCAD.Console.PrintLog(
9290
"Telemetry Addon: Error connecting, no telemetry will be sent for this session\n"
9391
)
9492
FreeCAD.Console.PrintLog(str(exception) + "\n")
@@ -317,6 +315,6 @@ def posthog_shutdown():
317315
params = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Telemetry")
318316
enabled = params.GetBool("Enabled", True)
319317
if enabled and posthog:
320-
FreeCAD.Console.PrintMessage("Telemetry Addon: Sending FreeCAD shutdown info to Posthog\n")
318+
FreeCAD.Console.PrintLog("Telemetry Addon: Sending FreeCAD shutdown info to Posthog\n")
321319
posthog_fc_shutdown()
322320
posthog.flush()

Sentry.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333

3434

3535
def before_send(event, _):
36-
FreeCAD.Console.PrintMessage(f"Sending event to Sentry: {event}\n")
36+
FreeCAD.Console.PrintLog(f"Sending event to Sentry: {event}\n")
3737
params = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Telemetry")
3838
enabled = params.GetBool("Enable", False)
3939
if not enabled:
40-
FreeCAD.Console.PrintMessage(" -> Send blocked because Telemetry is disabled\n")
40+
FreeCAD.Console.PrintLog(" -> Send blocked because Telemetry is disabled\n")
4141
return None # Drop the event
4242
return event
4343

@@ -49,8 +49,8 @@ def init_sentry(dsn):
4949
release = FreeCAD.Version()
5050

5151
if release[6] and release[6] != "main":
52-
FreeCAD.Console.PrintMessage("FreeCAD Telemetry addon disabled: not on main branch\n")
53-
FreeCAD.Console.PrintMessage(f"FreeCAD branch: {release[6]}\n")
52+
FreeCAD.Console.PrintLog("FreeCAD Telemetry addon disabled: not on main branch\n")
53+
FreeCAD.Console.PrintLog(f"FreeCAD branch: {release[6]}\n")
5454
return
5555

5656
major = release[0]
@@ -80,5 +80,5 @@ def init_sentry(dsn):
8080

8181

8282
def close_sentry_session():
83-
FreeCAD.Console.PrintMessage("Closing Sentry session\n")
83+
FreeCAD.Console.PrintLog("Closing Sentry session\n")
8484
sentry_sdk.get_global_scope().start_session()

TelemetryPreferences.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,17 +109,17 @@ def _enable_check_state_changed(self, check_state):
109109
# params = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Telemetry")
110110
# params.SetString("DSN", text)
111111
# init_sentry(text)
112-
# FreeCAD.Console.PrintMessage(f"Telemetry is now being sent to {text}\n")
112+
# FreeCAD.Console.PrintLog(f"Telemetry is now being sent to {text}\n")
113113
# self._reset_sentry()
114114

115115
# def _reset_sentry(self):
116116
# params = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Telemetry")
117117
# if params.GetBool("Enable", True):
118118
# dsn = params.GetString("DSN", "unset")
119-
# FreeCAD.Console.PrintMessage(f"Resetting Sentry to use DSN {dsn}\n")
119+
# FreeCAD.Console.PrintLog(f"Resetting Sentry to use DSN {dsn}\n")
120120
# init_sentry(dsn=dsn)
121121
# else:
122-
# FreeCAD.Console.PrintMessage(f"Deactivating Sentry (setting dsn=None)\n")
122+
# FreeCAD.Console.PrintLog(f"Deactivating Sentry (setting dsn=None)\n")
123123
# init_sentry(dsn=None)
124124

125125
def _data_removal_clicked(self):
@@ -163,11 +163,11 @@ def _remove_user_data() -> (bool, str):
163163
"Telemetry", "Your user data was successfully removed from the database."
164164
)
165165
else:
166-
FreeCAD.Console.PrintMessage(
166+
FreeCAD.Console.PrintLog(
167167
f"Received a {response.status} response to our request\n"
168168
)
169169
FreeCAD.Console.PrintError(response.read() + "\n")
170170
return False, error_string
171171
except urllib.request.HTTPError as e:
172-
FreeCAD.Console.PrintMessage(str(e) + "\n")
172+
FreeCAD.Console.PrintLog(str(e) + "\n")
173173
return False, error_string

0 commit comments

Comments
 (0)